mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-05 13:44:32 +02:00
Merge branch 'bugfix/esp_err_fix' into 'master'
CI: regenerate esp_err_to_name.c Closes IDFCI-689 See merge request espressif/esp-idf!14059
This commit is contained in:
@@ -194,20 +194,6 @@ test_idf_tools:
|
|||||||
- cd ${IDF_PATH}/tools
|
- cd ${IDF_PATH}/tools
|
||||||
- python3 ./idf_tools.py install-python-env
|
- python3 ./idf_tools.py install-python-env
|
||||||
|
|
||||||
test_esp_err_to_name_on_host:
|
|
||||||
extends: .host_test_template
|
|
||||||
artifacts:
|
|
||||||
when: on_failure
|
|
||||||
paths:
|
|
||||||
- components/esp32/esp_err_to_name.c
|
|
||||||
expire_in: 1 week
|
|
||||||
script:
|
|
||||||
- cd ${IDF_PATH}/tools/
|
|
||||||
- ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh -p 2.7.15 ./gen_esp_err_to_name.py
|
|
||||||
- git diff --exit-code -- ../components/esp_common/src/esp_err_to_name.c || { echo 'Differences found. Please run gen_esp_err_to_name.py and commit the changes.'; exit 1; }
|
|
||||||
- ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh -p 3.4.8 ./gen_esp_err_to_name.py
|
|
||||||
- git diff --exit-code -- ../components/esp_common/src/esp_err_to_name.c || { echo 'Differences found between running under Python 2 and 3.'; exit 1; }
|
|
||||||
|
|
||||||
test_esp32_efuse_table_on_host:
|
test_esp32_efuse_table_on_host:
|
||||||
extends: .host_test_template
|
extends: .host_test_template
|
||||||
artifacts:
|
artifacts:
|
||||||
|
@@ -109,6 +109,24 @@ check_public_headers:
|
|||||||
script:
|
script:
|
||||||
- python tools/ci/check_public_headers.py --jobs 4 --prefix xtensa-esp32-elf-
|
- python tools/ci/check_public_headers.py --jobs 4 --prefix xtensa-esp32-elf-
|
||||||
|
|
||||||
|
check_esp_err_to_name:
|
||||||
|
extends:
|
||||||
|
- .pre_check_base_template
|
||||||
|
- .rules:build
|
||||||
|
tags:
|
||||||
|
- build
|
||||||
|
artifacts:
|
||||||
|
when: on_failure
|
||||||
|
paths:
|
||||||
|
- components/esp_common/esp_err_to_name.c
|
||||||
|
expire_in: 1 week
|
||||||
|
script:
|
||||||
|
- cd ${IDF_PATH}/tools/
|
||||||
|
- ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh -p 2.7.15 ./gen_esp_err_to_name.py
|
||||||
|
- git diff --exit-code -- ../components/esp_common/src/esp_err_to_name.c || { echo 'Differences found. Please run gen_esp_err_to_name.py and commit the changes.'; exit 1; }
|
||||||
|
- ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh -p 3.4.8 ./gen_esp_err_to_name.py
|
||||||
|
- git diff --exit-code -- ../components/esp_common/src/esp_err_to_name.c || { echo 'Differences found between running under Python 2 and 3.'; exit 1; }
|
||||||
|
|
||||||
scan_tests:
|
scan_tests:
|
||||||
extends:
|
extends:
|
||||||
- .pre_check_base_template
|
- .pre_check_base_template
|
||||||
|
@@ -38,9 +38,6 @@
|
|||||||
#if __has_include("esp_ping.h")
|
#if __has_include("esp_ping.h")
|
||||||
#include "esp_ping.h"
|
#include "esp_ping.h"
|
||||||
#endif
|
#endif
|
||||||
#if __has_include("esp_serial_slave_link/essl.h")
|
|
||||||
#include "esp_serial_slave_link/essl.h"
|
|
||||||
#endif
|
|
||||||
#if __has_include("esp_spi_flash.h")
|
#if __has_include("esp_spi_flash.h")
|
||||||
#include "esp_spi_flash.h"
|
#include "esp_spi_flash.h"
|
||||||
#endif
|
#endif
|
||||||
@@ -115,9 +112,8 @@ static const esp_err_msg_t esp_err_msg_table[] = {
|
|||||||
# ifdef ESP_ERR_INVALID_MAC
|
# ifdef ESP_ERR_INVALID_MAC
|
||||||
ERR_TBL_IT(ESP_ERR_INVALID_MAC), /* 267 0x10b MAC address was invalid */
|
ERR_TBL_IT(ESP_ERR_INVALID_MAC), /* 267 0x10b MAC address was invalid */
|
||||||
# endif
|
# endif
|
||||||
// components/esp_serial_slave_link/include/esp_serial_slave_link/essl.h
|
|
||||||
# ifdef ESP_ERR_NOT_FINISHED
|
# ifdef ESP_ERR_NOT_FINISHED
|
||||||
ERR_TBL_IT(ESP_ERR_NOT_FINISHED), /* 513 0x201 */
|
ERR_TBL_IT(ESP_ERR_NOT_FINISHED), /* 268 0x10c There are items remained to retrieve */
|
||||||
# endif
|
# endif
|
||||||
// components/nvs_flash/include/nvs.h
|
// components/nvs_flash/include/nvs.h
|
||||||
# ifdef ESP_ERR_NVS_BASE
|
# ifdef ESP_ERR_NVS_BASE
|
||||||
|
Reference in New Issue
Block a user