From a300b3eb8127fe1b7611ed196b481ac6f229f137 Mon Sep 17 00:00:00 2001 From: Marius Vikhammer Date: Fri, 21 Apr 2023 12:37:30 +0800 Subject: [PATCH] ci: fix invalid kconfig options in system test apps --- components/esp_common/.build-test-rules.yml | 5 +++++ .../esp_common/test_apps/esp_common/sdkconfig.ci.psram | 1 - components/esp_system/.build-test-rules.yml | 4 ++++ .../test_apps/esp_system_unity_tests/main/CMakeLists.txt | 3 ++- .../esp_system_unity_tests/main/test_reset_reason.c | 3 ++- components/esp_timer/test_apps/main/CMakeLists.txt | 2 +- .../test_apps/freertos/sdkconfig.ci.freertos_options | 1 - components/heap/.build-test-rules.yml | 5 +++++ .../heap/test_apps/heap_tests/sdkconfig.ci.8bit_access | 1 + .../heap/test_apps/heap_tests/sdkconfig.ci.heap_trace | 1 + .../test_apps/heap_tests/sdkconfig.ci.heap_trace_hashmap | 1 + examples/system/deep_sleep/sdkconfig.ci.basic | 1 - examples/system/deep_sleep/sdkconfig.ci.esp32_singlecore | 1 - examples/system/esp_timer/sdkconfig.ci.rtc | 6 +----- examples/system/himem/sdkconfig.defaults | 1 - examples/system/ulp_riscv/adc/sdkconfig.defaults | 2 +- .../system/ulp_riscv/ds18b20_onewire/sdkconfig.defaults | 2 +- examples/system/ulp_riscv/gpio/sdkconfig.defaults | 2 +- examples/system/ulp_riscv/i2c/sdkconfig.defaults | 2 +- examples/system/ulp_riscv/uart_print/sdkconfig.defaults | 2 +- examples/system/xip_from_psram/sdkconfig.ci.esp32s3_f4r8 | 1 + .../test_apps/system/build_test/sdkconfig.ci.rtc_gpio_desc | 1 - tools/test_apps/system/build_test/sdkconfig.ci.trax | 2 -- tools/test_apps/system/build_test/sdkconfig.ci.trax_esp32 | 2 ++ tools/test_apps/system/build_test/sdkconfig.ci.trax_esp32s2 | 2 ++ tools/unit-test-app/sdkconfig.defaults | 1 - tools/unit-test-app/sdkconfig.defaults.esp32 | 1 + 27 files changed, 34 insertions(+), 22 deletions(-) create mode 100644 components/esp_common/.build-test-rules.yml delete mode 100644 tools/test_apps/system/build_test/sdkconfig.ci.rtc_gpio_desc delete mode 100644 tools/test_apps/system/build_test/sdkconfig.ci.trax create mode 100644 tools/test_apps/system/build_test/sdkconfig.ci.trax_esp32 create mode 100644 tools/test_apps/system/build_test/sdkconfig.ci.trax_esp32s2 diff --git a/components/esp_common/.build-test-rules.yml b/components/esp_common/.build-test-rules.yml new file mode 100644 index 0000000000..04fd48936f --- /dev/null +++ b/components/esp_common/.build-test-rules.yml @@ -0,0 +1,5 @@ +# Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps + +components/esp_common/test_apps/esp_common: + disable: + - if: CONFIG_NAME == "psram" and SOC_SPIRAM_SUPPORTED != 1 diff --git a/components/esp_common/test_apps/esp_common/sdkconfig.ci.psram b/components/esp_common/test_apps/esp_common/sdkconfig.ci.psram index acda79a2b0..f2f51a80ae 100644 --- a/components/esp_common/test_apps/esp_common/sdkconfig.ci.psram +++ b/components/esp_common/test_apps/esp_common/sdkconfig.ci.psram @@ -1,4 +1,3 @@ # For EXT_RAM_BSS_ATTR - CONFIG_SPIRAM=y CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y diff --git a/components/esp_system/.build-test-rules.yml b/components/esp_system/.build-test-rules.yml index 913514beca..0aaac71d59 100644 --- a/components/esp_system/.build-test-rules.yml +++ b/components/esp_system/.build-test-rules.yml @@ -1,5 +1,9 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps +components/esp_system/test_apps/esp_system_unity_tests: + disable: + - if: CONFIG_NAME == "psram" and SOC_SPIRAM_SUPPORTED != 1 + components/esp_system/test_apps/linux_apis: enable: - if: IDF_TARGET == "linux" diff --git a/components/esp_system/test_apps/esp_system_unity_tests/main/CMakeLists.txt b/components/esp_system/test_apps/esp_system_unity_tests/main/CMakeLists.txt index 28be7efb5a..b2d828a516 100644 --- a/components/esp_system/test_apps/esp_system_unity_tests/main/CMakeLists.txt +++ b/components/esp_system/test_apps/esp_system_unity_tests/main/CMakeLists.txt @@ -2,7 +2,8 @@ set(requires "unity" "test_utils" "driver" "esp_timer" - "nvs_flash") + "nvs_flash" + "esp_psram") set(SRC "test_app_main.c" "test_backtrace.c" diff --git a/components/esp_system/test_apps/esp_system_unity_tests/main/test_reset_reason.c b/components/esp_system/test_apps/esp_system_unity_tests/main/test_reset_reason.c index f040254069..72b70eb943 100644 --- a/components/esp_system/test_apps/esp_system_unity_tests/main/test_reset_reason.c +++ b/components/esp_system/test_apps/esp_system_unity_tests/main/test_reset_reason.c @@ -3,6 +3,7 @@ * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ +#include #include "unity.h" #include "esp_system.h" #include "esp_task_wdt.h" @@ -338,7 +339,7 @@ static int fibonacci(int n, void* func(void)) uint32_t base, start; RSR(WINDOWBASE, base); RSR(WINDOWSTART, start); - printf("WINDOWBASE = %-2d WINDOWSTART = 0x%x\n", base, start); + printf("WINDOWBASE = %-2"PRIi32" WINDOWSTART = 0x%"PRIx32"\n", base, start); if (n <= 1) { StackType_t *last_addr_stack = esp_cpu_get_sp(); StackType_t *used_stack = (StackType_t *) (start_addr_stack - last_addr_stack); diff --git a/components/esp_timer/test_apps/main/CMakeLists.txt b/components/esp_timer/test_apps/main/CMakeLists.txt index fe611821d5..041c23bb57 100644 --- a/components/esp_timer/test_apps/main/CMakeLists.txt +++ b/components/esp_timer/test_apps/main/CMakeLists.txt @@ -1,4 +1,4 @@ idf_component_register(SRC_DIRS "." PRIV_INCLUDE_DIRS "../../private_include" - PRIV_REQUIRES cmock test_utils esp_timer spi_flash + PRIV_REQUIRES cmock test_utils esp_timer spi_flash esp_psram WHOLE_ARCHIVE) diff --git a/components/freertos/test_apps/freertos/sdkconfig.ci.freertos_options b/components/freertos/test_apps/freertos/sdkconfig.ci.freertos_options index 65e9cff7e9..6b278c939a 100644 --- a/components/freertos/test_apps/freertos/sdkconfig.ci.freertos_options +++ b/components/freertos/test_apps/freertos/sdkconfig.ci.freertos_options @@ -6,7 +6,6 @@ CONFIG_FREERTOS_HZ=500 CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL=y CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y CONFIG_FREERTOS_INTERRUPT_BACKTRACE=n -CONFIG_FREERTOS_LEGACY_HOOKS=y CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP=y CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=10 diff --git a/components/heap/.build-test-rules.yml b/components/heap/.build-test-rules.yml index 856c56efde..e323365b56 100644 --- a/components/heap/.build-test-rules.yml +++ b/components/heap/.build-test-rules.yml @@ -1,5 +1,10 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps +components/heap/test_apps/heap_tests: + disable: + - if: CONFIG_NAME == "psram" and SOC_SPIRAM_SUPPORTED != 1 + - if: CONFIG_NAME == "psram_all_ext" and SOC_SPIRAM_SUPPORTED != 1 + components/heap/test_apps/host_test_linux: enable: - if: IDF_TARGET == "linux" diff --git a/components/heap/test_apps/heap_tests/sdkconfig.ci.8bit_access b/components/heap/test_apps/heap_tests/sdkconfig.ci.8bit_access index c8710c4043..3cc667f532 100644 --- a/components/heap/test_apps/heap_tests/sdkconfig.ci.8bit_access +++ b/components/heap/test_apps/heap_tests/sdkconfig.ci.8bit_access @@ -1,2 +1,3 @@ +CONFIG_IDF_TARGET="esp32" CONFIG_FREERTOS_UNICORE=y CONFIG_ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY=y diff --git a/components/heap/test_apps/heap_tests/sdkconfig.ci.heap_trace b/components/heap/test_apps/heap_tests/sdkconfig.ci.heap_trace index fd9162ff5e..f14177fa36 100644 --- a/components/heap/test_apps/heap_tests/sdkconfig.ci.heap_trace +++ b/components/heap/test_apps/heap_tests/sdkconfig.ci.heap_trace @@ -1,2 +1,3 @@ +CONFIG_IDF_TARGET="esp32" CONFIG_SPIRAM=y CONFIG_HEAP_TRACING_STANDALONE=y diff --git a/components/heap/test_apps/heap_tests/sdkconfig.ci.heap_trace_hashmap b/components/heap/test_apps/heap_tests/sdkconfig.ci.heap_trace_hashmap index 19a7200c0c..72ba9e16f7 100644 --- a/components/heap/test_apps/heap_tests/sdkconfig.ci.heap_trace_hashmap +++ b/components/heap/test_apps/heap_tests/sdkconfig.ci.heap_trace_hashmap @@ -1,3 +1,4 @@ +CONFIG_IDF_TARGET="esp32" CONFIG_SPIRAM=y CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y CONFIG_HEAP_TRACING_STANDALONE=y diff --git a/examples/system/deep_sleep/sdkconfig.ci.basic b/examples/system/deep_sleep/sdkconfig.ci.basic index 9a78ce345b..6aa89f368a 100644 --- a/examples/system/deep_sleep/sdkconfig.ci.basic +++ b/examples/system/deep_sleep/sdkconfig.ci.basic @@ -1,6 +1,5 @@ # Generic config CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y -CONFIG_EXAMPLE_ULP_TEMPERATURE_WAKEUP=n CONFIG_EXAMPLE_EXT1_WAKEUP=n CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80=y diff --git a/examples/system/deep_sleep/sdkconfig.ci.esp32_singlecore b/examples/system/deep_sleep/sdkconfig.ci.esp32_singlecore index b4caf12296..d4587def0f 100644 --- a/examples/system/deep_sleep/sdkconfig.ci.esp32_singlecore +++ b/examples/system/deep_sleep/sdkconfig.ci.esp32_singlecore @@ -5,7 +5,6 @@ CONFIG_FREERTOS_UNICORE=y # Generic config CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y -CONFIG_EXAMPLE_ULP_TEMPERATURE_WAKEUP=n CONFIG_EXAMPLE_EXT1_WAKEUP=n CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80=y diff --git a/examples/system/esp_timer/sdkconfig.ci.rtc b/examples/system/esp_timer/sdkconfig.ci.rtc index 0b0237ec75..5ccfc533e4 100644 --- a/examples/system/esp_timer/sdkconfig.ci.rtc +++ b/examples/system/esp_timer/sdkconfig.ci.rtc @@ -2,8 +2,4 @@ # This is to avoid any timing impact on test behavior CONFIG_ESP_CONSOLE_SECONDARY_NONE=y -CONFIG_ESP32_TIME_SYSCALL_USE_RTC=y -CONFIG_ESP32S2_TIME_SYSCALL_USE_RTC=y -CONFIG_ESP32S3_TIME_SYSCALL_USE_RTC=y -CONFIG_ESP32C2_TIME_SYSCALL_USE_RTC=y -CONFIG_ESP32C3_TIME_SYSCALL_USE_RTC=y +CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC=y diff --git a/examples/system/himem/sdkconfig.defaults b/examples/system/himem/sdkconfig.defaults index bdf45dff00..058e5a0c06 100644 --- a/examples/system/himem/sdkconfig.defaults +++ b/examples/system/himem/sdkconfig.defaults @@ -3,7 +3,6 @@ CONFIG_SPIRAM_BOOT_INIT=y CONFIG_SPIRAM_IGNORE_NOTFOUND=n CONFIG_SPIRAM_USE_MALLOC=y CONFIG_SPIRAM_TYPE_AUTO=y -CONFIG_SPIRAM_SIZE=-1 CONFIG_SPIRAM_SPEED_40M=y CONFIG_SPIRAM_MEMTEST=y CONFIG_SPIRAM_CACHE_WORKAROUND=y diff --git a/examples/system/ulp_riscv/adc/sdkconfig.defaults b/examples/system/ulp_riscv/adc/sdkconfig.defaults index a28f71162e..e3745e5057 100644 --- a/examples/system/ulp_riscv/adc/sdkconfig.defaults +++ b/examples/system/ulp_riscv/adc/sdkconfig.defaults @@ -1,6 +1,6 @@ # Enable ULP CONFIG_ULP_COPROC_ENABLED=y -CONFIG_ULP_COPROC_RISCV=y +CONFIG_ULP_COPROC_TYPE_RISCV=y CONFIG_ULP_COPROC_RESERVE_MEM=4096 # Set log level to Warning to produce clean output CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y diff --git a/examples/system/ulp_riscv/ds18b20_onewire/sdkconfig.defaults b/examples/system/ulp_riscv/ds18b20_onewire/sdkconfig.defaults index a28f71162e..e3745e5057 100644 --- a/examples/system/ulp_riscv/ds18b20_onewire/sdkconfig.defaults +++ b/examples/system/ulp_riscv/ds18b20_onewire/sdkconfig.defaults @@ -1,6 +1,6 @@ # Enable ULP CONFIG_ULP_COPROC_ENABLED=y -CONFIG_ULP_COPROC_RISCV=y +CONFIG_ULP_COPROC_TYPE_RISCV=y CONFIG_ULP_COPROC_RESERVE_MEM=4096 # Set log level to Warning to produce clean output CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y diff --git a/examples/system/ulp_riscv/gpio/sdkconfig.defaults b/examples/system/ulp_riscv/gpio/sdkconfig.defaults index a28f71162e..e3745e5057 100644 --- a/examples/system/ulp_riscv/gpio/sdkconfig.defaults +++ b/examples/system/ulp_riscv/gpio/sdkconfig.defaults @@ -1,6 +1,6 @@ # Enable ULP CONFIG_ULP_COPROC_ENABLED=y -CONFIG_ULP_COPROC_RISCV=y +CONFIG_ULP_COPROC_TYPE_RISCV=y CONFIG_ULP_COPROC_RESERVE_MEM=4096 # Set log level to Warning to produce clean output CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y diff --git a/examples/system/ulp_riscv/i2c/sdkconfig.defaults b/examples/system/ulp_riscv/i2c/sdkconfig.defaults index a28f71162e..e3745e5057 100644 --- a/examples/system/ulp_riscv/i2c/sdkconfig.defaults +++ b/examples/system/ulp_riscv/i2c/sdkconfig.defaults @@ -1,6 +1,6 @@ # Enable ULP CONFIG_ULP_COPROC_ENABLED=y -CONFIG_ULP_COPROC_RISCV=y +CONFIG_ULP_COPROC_TYPE_RISCV=y CONFIG_ULP_COPROC_RESERVE_MEM=4096 # Set log level to Warning to produce clean output CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y diff --git a/examples/system/ulp_riscv/uart_print/sdkconfig.defaults b/examples/system/ulp_riscv/uart_print/sdkconfig.defaults index a28f71162e..e3745e5057 100644 --- a/examples/system/ulp_riscv/uart_print/sdkconfig.defaults +++ b/examples/system/ulp_riscv/uart_print/sdkconfig.defaults @@ -1,6 +1,6 @@ # Enable ULP CONFIG_ULP_COPROC_ENABLED=y -CONFIG_ULP_COPROC_RISCV=y +CONFIG_ULP_COPROC_TYPE_RISCV=y CONFIG_ULP_COPROC_RESERVE_MEM=4096 # Set log level to Warning to produce clean output CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y diff --git a/examples/system/xip_from_psram/sdkconfig.ci.esp32s3_f4r8 b/examples/system/xip_from_psram/sdkconfig.ci.esp32s3_f4r8 index f1e352e8e0..32ff16326b 100644 --- a/examples/system/xip_from_psram/sdkconfig.ci.esp32s3_f4r8 +++ b/examples/system/xip_from_psram/sdkconfig.ci.esp32s3_f4r8 @@ -1 +1,2 @@ +CONFIG_IDF_TARGET="esp32s3" CONFIG_SPIRAM_MODE_OCT=y diff --git a/tools/test_apps/system/build_test/sdkconfig.ci.rtc_gpio_desc b/tools/test_apps/system/build_test/sdkconfig.ci.rtc_gpio_desc deleted file mode 100644 index 83b977585e..0000000000 --- a/tools/test_apps/system/build_test/sdkconfig.ci.rtc_gpio_desc +++ /dev/null @@ -1 +0,0 @@ -CONFIG_RTCIO_SUPPORT_RTC_GPIO_DESC=y diff --git a/tools/test_apps/system/build_test/sdkconfig.ci.trax b/tools/test_apps/system/build_test/sdkconfig.ci.trax deleted file mode 100644 index 4de27396ef..0000000000 --- a/tools/test_apps/system/build_test/sdkconfig.ci.trax +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_ESP32_TRAX=y -CONFIG_ESP32S2_TRAX=y diff --git a/tools/test_apps/system/build_test/sdkconfig.ci.trax_esp32 b/tools/test_apps/system/build_test/sdkconfig.ci.trax_esp32 new file mode 100644 index 0000000000..75e830e5f6 --- /dev/null +++ b/tools/test_apps/system/build_test/sdkconfig.ci.trax_esp32 @@ -0,0 +1,2 @@ +CONFIG_IDF_TARGET="esp32" +CONFIG_ESP32_TRAX=y diff --git a/tools/test_apps/system/build_test/sdkconfig.ci.trax_esp32s2 b/tools/test_apps/system/build_test/sdkconfig.ci.trax_esp32s2 new file mode 100644 index 0000000000..90ec7d6776 --- /dev/null +++ b/tools/test_apps/system/build_test/sdkconfig.ci.trax_esp32s2 @@ -0,0 +1,2 @@ +CONFIG_IDF_TARGET="esp32s2" +CONFIG_ESP32S2_TRAX=y diff --git a/tools/unit-test-app/sdkconfig.defaults b/tools/unit-test-app/sdkconfig.defaults index 494608154c..59e5fa46bf 100644 --- a/tools/unit-test-app/sdkconfig.defaults +++ b/tools/unit-test-app/sdkconfig.defaults @@ -17,6 +17,5 @@ CONFIG_ADC_DISABLE_DAC=n CONFIG_COMPILER_WARN_WRITE_STRINGS=y CONFIG_SPI_MASTER_IN_IRAM=y CONFIG_EFUSE_VIRTUAL=y -CONFIG_SPIRAM_BANKSWITCH_ENABLE=n CONFIG_UNITY_ENABLE_BACKTRACE_ON_FAIL=y CONFIG_MQTT_TEST_BROKER_URI="mqtt://${EXAMPLE_MQTT_BROKER_TCP}" diff --git a/tools/unit-test-app/sdkconfig.defaults.esp32 b/tools/unit-test-app/sdkconfig.defaults.esp32 index 59093635f0..70cc49d9b3 100644 --- a/tools/unit-test-app/sdkconfig.defaults.esp32 +++ b/tools/unit-test-app/sdkconfig.defaults.esp32 @@ -1,3 +1,4 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y CONFIG_XTAL_FREQ_AUTO=y CONFIG_SPI_FLASH_SHARE_SPI1_BUS=y +CONFIG_SPIRAM_BANKSWITCH_ENABLE=n