diff --git a/.gitlab/ci/host-test.yml b/.gitlab/ci/host-test.yml index 5cf7123de4..e21cd89f0d 100644 --- a/.gitlab/ci/host-test.yml +++ b/.gitlab/ci/host-test.yml @@ -194,20 +194,6 @@ test_idf_tools: - cd ${IDF_PATH}/tools - 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: extends: .host_test_template artifacts: diff --git a/.gitlab/ci/pre_check.yml b/.gitlab/ci/pre_check.yml index 0a10c6b0df..3569ba593b 100644 --- a/.gitlab/ci/pre_check.yml +++ b/.gitlab/ci/pre_check.yml @@ -109,6 +109,24 @@ check_public_headers: script: - 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: extends: - .pre_check_base_template diff --git a/components/esp_common/src/esp_err_to_name.c b/components/esp_common/src/esp_err_to_name.c index 8f18f4fcc6..e7b429f72e 100644 --- a/components/esp_common/src/esp_err_to_name.c +++ b/components/esp_common/src/esp_err_to_name.c @@ -38,9 +38,6 @@ #if __has_include("esp_ping.h") #include "esp_ping.h" #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") #include "esp_spi_flash.h" #endif @@ -115,9 +112,8 @@ static const esp_err_msg_t esp_err_msg_table[] = { # ifdef ESP_ERR_INVALID_MAC ERR_TBL_IT(ESP_ERR_INVALID_MAC), /* 267 0x10b MAC address was invalid */ # endif - // components/esp_serial_slave_link/include/esp_serial_slave_link/essl.h # 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 // components/nvs_flash/include/nvs.h # ifdef ESP_ERR_NVS_BASE