From c36e06c45c577384736ca5fc38c4c632f9cc9b9b Mon Sep 17 00:00:00 2001 From: Darian Leung Date: Sat, 15 Oct 2022 02:29:51 +0800 Subject: [PATCH] freertos: Add test app sdkconfig This commit adds the sdkconfig files for the FreeRTOS test app. These configurations were dervied from the various legacy unit test app's config files that included the FreeRTOS component. This commit tries to keep a 1 to 1 config parity with the legacy test app. Meaning, if FreeRTOS test were run on a particular target with a particular config, that config will be represented in one of the test app's sdkconfig.ci.XXX files. However, the following configurations were removed for FreeRTOS tests: - The "freertos_flash" option was removed due to redudancy (already tested in freertos_options) --- .../test_apps/freertos/pytest_freertos.py | 9 ++++++++ .../test_apps/freertos/sdkconfig.ci.default | 1 + .../freertos/sdkconfig.ci.freertos_options | 6 +---- .../test_apps/freertos/sdkconfig.ci.psram | 12 ++++++++++ .../test_apps/freertos/sdkconfig.ci.release | 5 ++++ .../freertos/sdkconfig.ci.single_core | 4 ++++ .../test_apps/freertos/sdkconfig.defaults | 7 ++++++ tools/unit-test-app/configs/default | 2 +- tools/unit-test-app/configs/default_2 | 2 +- tools/unit-test-app/configs/default_2_c3 | 2 +- tools/unit-test-app/configs/default_2_s2 | 2 +- tools/unit-test-app/configs/default_2_s3 | 2 +- tools/unit-test-app/configs/default_3_c2 | 2 +- tools/unit-test-app/configs/default_c2 | 2 +- tools/unit-test-app/configs/default_c3 | 2 +- tools/unit-test-app/configs/default_s2_1 | 2 +- tools/unit-test-app/configs/default_s3 | 2 +- tools/unit-test-app/configs/freertos_flash | 2 +- tools/unit-test-app/configs/freertos_options | 23 ------------------- .../unit-test-app/configs/freertos_options_c3 | 22 ------------------ .../unit-test-app/configs/freertos_options_s2 | 21 ----------------- tools/unit-test-app/configs/psram | 2 +- tools/unit-test-app/configs/psram_3 | 2 +- tools/unit-test-app/configs/release | 2 +- tools/unit-test-app/configs/release_2 | 2 +- tools/unit-test-app/configs/release_2_s2 | 2 +- tools/unit-test-app/configs/release_c2 | 2 +- tools/unit-test-app/configs/release_c3 | 2 +- tools/unit-test-app/configs/release_s2 | 2 +- tools/unit-test-app/configs/release_s3 | 2 +- tools/unit-test-app/configs/single_core | 2 +- tools/unit-test-app/configs/single_core_2 | 2 +- tools/unit-test-app/configs/single_core_2_s2 | 2 +- tools/unit-test-app/sdkconfig.defaults | 4 ---- 34 files changed, 62 insertions(+), 98 deletions(-) create mode 100644 components/freertos/test_apps/freertos/sdkconfig.ci.default rename tools/unit-test-app/configs/freertos_options_c2 => components/freertos/test_apps/freertos/sdkconfig.ci.freertos_options (76%) create mode 100644 components/freertos/test_apps/freertos/sdkconfig.ci.psram create mode 100644 components/freertos/test_apps/freertos/sdkconfig.ci.release create mode 100644 components/freertos/test_apps/freertos/sdkconfig.ci.single_core create mode 100644 components/freertos/test_apps/freertos/sdkconfig.defaults delete mode 100644 tools/unit-test-app/configs/freertos_options delete mode 100644 tools/unit-test-app/configs/freertos_options_c3 delete mode 100644 tools/unit-test-app/configs/freertos_options_s2 diff --git a/components/freertos/test_apps/freertos/pytest_freertos.py b/components/freertos/test_apps/freertos/pytest_freertos.py index 464d842724..dee8f04e11 100644 --- a/components/freertos/test_apps/freertos/pytest_freertos.py +++ b/components/freertos/test_apps/freertos/pytest_freertos.py @@ -4,9 +4,18 @@ import pytest from pytest_embedded import Dut +CONFIGS = [ + pytest.param('default', marks=[pytest.mark.supported_targets]), + pytest.param('freertos_options', marks=[pytest.mark.supported_targets]), + pytest.param('psram', marks=[pytest.mark.esp32]), + pytest.param('release', marks=[pytest.mark.supported_targets]), + pytest.param('single_core', marks=[pytest.mark.esp32]), +] + @pytest.mark.supported_targets @pytest.mark.generic +@pytest.mark.parametrize('config', CONFIGS, indirect=True) def test_freertos(dut: Dut) -> None: dut.expect_exact('Press ENTER to see the list of tests') dut.write('*') diff --git a/components/freertos/test_apps/freertos/sdkconfig.ci.default b/components/freertos/test_apps/freertos/sdkconfig.ci.default new file mode 100644 index 0000000000..c149cb926f --- /dev/null +++ b/components/freertos/test_apps/freertos/sdkconfig.ci.default @@ -0,0 +1 @@ +# This is left intentionally blank. It inherits all configurations from sdkconfg.defaults diff --git a/tools/unit-test-app/configs/freertos_options_c2 b/components/freertos/test_apps/freertos/sdkconfig.ci.freertos_options similarity index 76% rename from tools/unit-test-app/configs/freertos_options_c2 rename to components/freertos/test_apps/freertos/sdkconfig.ci.freertos_options index 53b3026581..15a026cfe6 100644 --- a/tools/unit-test-app/configs/freertos_options_c2 +++ b/components/freertos/test_apps/freertos/sdkconfig.ci.freertos_options @@ -1,8 +1,4 @@ -# This is a small set of tests where we enable as many as possible of the optional features -# in FreeRTOS that are gated behind config - -CONFIG_IDF_TARGET="esp32c2" -TEST_COMPONENTS=freertos +# Test configuration for enabling multiple optional FreeRTOS related features. Tested on all targets CONFIG_FREERTOS_CORETIMER_1=y CONFIG_FREERTOS_OPTIMIZED_SCHEDULER=n diff --git a/components/freertos/test_apps/freertos/sdkconfig.ci.psram b/components/freertos/test_apps/freertos/sdkconfig.ci.psram new file mode 100644 index 0000000000..5294d295d6 --- /dev/null +++ b/components/freertos/test_apps/freertos/sdkconfig.ci.psram @@ -0,0 +1,12 @@ +# Test configuration for using FreeRTOS with PSRAM enabled. Only tested on the ESP32 + +CONFIG_IDF_TARGET="esp32" + +# Enable SPIRAM +CONFIG_SPIRAM=y +CONFIG_SPIRAM_OCCUPY_NO_HOST=y + +# Disable encrypted flash reads/writes to save IRAM in this build configuration +CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n +CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY=y +CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y diff --git a/components/freertos/test_apps/freertos/sdkconfig.ci.release b/components/freertos/test_apps/freertos/sdkconfig.ci.release new file mode 100644 index 0000000000..9a981808d7 --- /dev/null +++ b/components/freertos/test_apps/freertos/sdkconfig.ci.release @@ -0,0 +1,5 @@ +# Test configuration for a release build of FreeRTOS. Tested on all targets + +CONFIG_COMPILER_OPTIMIZATION_SIZE=y +CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y +CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y diff --git a/components/freertos/test_apps/freertos/sdkconfig.ci.single_core b/components/freertos/test_apps/freertos/sdkconfig.ci.single_core new file mode 100644 index 0000000000..69b5e1abdc --- /dev/null +++ b/components/freertos/test_apps/freertos/sdkconfig.ci.single_core @@ -0,0 +1,4 @@ +# Test configuration for using FreeRTOS with under single core on a multicore target. Only tested on the ESP32 + +CONFIG_IDF_TARGET="esp32" +CONFIG_FREERTOS_UNICORE=y diff --git a/components/freertos/test_apps/freertos/sdkconfig.defaults b/components/freertos/test_apps/freertos/sdkconfig.defaults new file mode 100644 index 0000000000..44149a08d4 --- /dev/null +++ b/components/freertos/test_apps/freertos/sdkconfig.defaults @@ -0,0 +1,7 @@ +CONFIG_ESP_TASK_WDT=n +CONFIG_FREERTOS_HZ=1000 +CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 +CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=7 +CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=3000 +CONFIG_FREERTOS_USE_TRACE_FACILITY=y +CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y diff --git a/tools/unit-test-app/configs/default b/tools/unit-test-app/configs/default index 8738fb2b14..6452c346d2 100644 --- a/tools/unit-test-app/configs/default +++ b/tools/unit-test-app/configs/default @@ -1,5 +1,5 @@ # This config is split between targets since different component needs to be included (esp32, esp32s2) # IRAM is full... split some component to default_32_2 CONFIG_IDF_TARGET="esp32" -TEST_COMPONENTS=freertos esp_hw_support esp_ipc esp_system esp_timer driver +TEST_COMPONENTS=esp_hw_support esp_ipc esp_system esp_timer driver CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD=y diff --git a/tools/unit-test-app/configs/default_2 b/tools/unit-test-app/configs/default_2 index 630f9c0693..80c4880421 100644 --- a/tools/unit-test-app/configs/default_2 +++ b/tools/unit-test-app/configs/default_2 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be excluded (esp32, esp32s2) CONFIG_IDF_TARGET="esp32" -TEST_EXCLUDE_COMPONENTS=bt freertos esp_hw_support esp_ipc esp_pm esp_system esp_timer driver soc spi_flash vfs test_utils experimental_cpp_component +TEST_EXCLUDE_COMPONENTS=bt esp_hw_support esp_ipc esp_pm esp_system esp_timer driver soc spi_flash vfs test_utils experimental_cpp_component diff --git a/tools/unit-test-app/configs/default_2_c3 b/tools/unit-test-app/configs/default_2_c3 index 44504fc9a2..3d9d41cff8 100644 --- a/tools/unit-test-app/configs/default_2_c3 +++ b/tools/unit-test-app/configs/default_2_c3 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be excluded CONFIG_IDF_TARGET="esp32c3" -TEST_EXCLUDE_COMPONENTS=bt esp_pm freertos esp_hw_support esp_ipc esp_system esp_timer driver soc spi_flash vfs lwip spiffs experimental_cpp_component perfmon test_utils +TEST_EXCLUDE_COMPONENTS=bt esp_pm esp_hw_support esp_ipc esp_system esp_timer driver soc spi_flash vfs lwip spiffs experimental_cpp_component perfmon test_utils diff --git a/tools/unit-test-app/configs/default_2_s2 b/tools/unit-test-app/configs/default_2_s2 index fc5fc9cba0..8cae45705e 100644 --- a/tools/unit-test-app/configs/default_2_s2 +++ b/tools/unit-test-app/configs/default_2_s2 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be excluded (esp32, esp32s2) CONFIG_IDF_TARGET="esp32s2" -TEST_EXCLUDE_COMPONENTS=bt freertos esp_hw_support esp_ipc esp_pm esp_system esp_timer driver soc spi_flash vfs experimental_cpp_component +TEST_EXCLUDE_COMPONENTS=bt esp_hw_support esp_ipc esp_pm esp_system esp_timer driver soc spi_flash vfs experimental_cpp_component diff --git a/tools/unit-test-app/configs/default_2_s3 b/tools/unit-test-app/configs/default_2_s3 index dcc7249252..156b131f2f 100644 --- a/tools/unit-test-app/configs/default_2_s3 +++ b/tools/unit-test-app/configs/default_2_s3 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be excluded (esp32, esp32s2) CONFIG_IDF_TARGET="esp32s3" -TEST_EXCLUDE_COMPONENTS=bt freertos esp32s3 esp_ipc esp_pm esp_system esp_timer driver soc spi_flash vfs experimental_cpp_component test_utils +TEST_EXCLUDE_COMPONENTS=bt esp32s3 esp_ipc esp_pm esp_system esp_timer driver soc spi_flash vfs experimental_cpp_component test_utils diff --git a/tools/unit-test-app/configs/default_3_c2 b/tools/unit-test-app/configs/default_3_c2 index 6c394c843c..6d2a2958e8 100644 --- a/tools/unit-test-app/configs/default_3_c2 +++ b/tools/unit-test-app/configs/default_3_c2 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32c2" -TEST_EXCLUDE_COMPONENTS=app_trace efuse esp_common esp_eth esp_hid esp_netif esp_phy esp_ringbuf esp_wifi espcoredump hal lwip mdns mqtt newlib nvs_flash partition_table sdmmc freertos esp_hw_support esp_ipc esp_system esp_timer driver soc spi_flash vfs +TEST_EXCLUDE_COMPONENTS=app_trace efuse esp_common esp_eth esp_hid esp_netif esp_phy esp_ringbuf esp_wifi espcoredump hal lwip mdns mqtt newlib nvs_flash partition_table sdmmc esp_hw_support esp_ipc esp_system esp_timer driver soc spi_flash vfs diff --git a/tools/unit-test-app/configs/default_c2 b/tools/unit-test-app/configs/default_c2 index 7009dfe166..607a538835 100644 --- a/tools/unit-test-app/configs/default_c2 +++ b/tools/unit-test-app/configs/default_c2 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32c2" -TEST_COMPONENTS=freertos esp_hw_support esp_ipc esp_system esp_timer driver soc spi_flash vfs +TEST_COMPONENTS= esp_hw_support esp_ipc esp_system esp_timer driver soc spi_flash vfs diff --git a/tools/unit-test-app/configs/default_c3 b/tools/unit-test-app/configs/default_c3 index 67c9a75f90..36322c5b5e 100644 --- a/tools/unit-test-app/configs/default_c3 +++ b/tools/unit-test-app/configs/default_c3 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32c3" -TEST_COMPONENTS=freertos esp_hw_support esp_ipc esp_system esp_timer driver +TEST_COMPONENTS=esp_hw_support esp_ipc esp_system esp_timer driver diff --git a/tools/unit-test-app/configs/default_s2_1 b/tools/unit-test-app/configs/default_s2_1 index ec990e29a4..cf5ae3fa56 100644 --- a/tools/unit-test-app/configs/default_s2_1 +++ b/tools/unit-test-app/configs/default_s2_1 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be included (esp32, esp32s2) CONFIG_IDF_TARGET="esp32s2" -TEST_COMPONENTS=freertos esp_hw_support esp_system esp_timer driver +TEST_COMPONENTS=esp_hw_support esp_system esp_timer driver diff --git a/tools/unit-test-app/configs/default_s3 b/tools/unit-test-app/configs/default_s3 index 0d78b2ff2a..b7767ea89c 100644 --- a/tools/unit-test-app/configs/default_s3 +++ b/tools/unit-test-app/configs/default_s3 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32s3" -TEST_COMPONENTS=freertos esp_hw_support esp_ipc esp_system esp_timer driver soc spi_flash vfs +TEST_COMPONENTS=esp_hw_support esp_ipc esp_system esp_timer driver soc spi_flash vfs diff --git a/tools/unit-test-app/configs/freertos_flash b/tools/unit-test-app/configs/freertos_flash index 99c6b71961..0d3204820c 100644 --- a/tools/unit-test-app/configs/freertos_flash +++ b/tools/unit-test-app/configs/freertos_flash @@ -1,2 +1,2 @@ -TEST_COMPONENTS=freertos driver spi_flash +TEST_COMPONENTS=driver spi_flash CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y diff --git a/tools/unit-test-app/configs/freertos_options b/tools/unit-test-app/configs/freertos_options deleted file mode 100644 index 3e3196c6c5..0000000000 --- a/tools/unit-test-app/configs/freertos_options +++ /dev/null @@ -1,23 +0,0 @@ -# This is a small set of tests where we enable as many as possible of the optional features -# in FreeRTOS that are gated behind config - -CONFIG_IDF_TARGET="esp32" -TEST_COMPONENTS=freertos - -CONFIG_FREERTOS_CORETIMER_1=y -CONFIG_FREERTOS_OPTIMIZED_SCHEDULER=n -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_ENABLE_STATIC_TASK_CLEAN_UP=y -CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=10 -CONFIG_FREERTOS_USE_TRACE_FACILITY=y -CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS=y -CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=y -CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y -CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y -CONFIG_FREERTOS_FPU_IN_ISR=y -CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=16 -CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT=y diff --git a/tools/unit-test-app/configs/freertos_options_c3 b/tools/unit-test-app/configs/freertos_options_c3 deleted file mode 100644 index 3ef2aa5066..0000000000 --- a/tools/unit-test-app/configs/freertos_options_c3 +++ /dev/null @@ -1,22 +0,0 @@ -# This is a small set of tests where we enable as many as possible of the optional features -# in FreeRTOS that are gated behind config - -CONFIG_IDF_TARGET="esp32c3" -TEST_COMPONENTS=freertos - -CONFIG_FREERTOS_CORETIMER_1=y -CONFIG_FREERTOS_OPTIMIZED_SCHEDULER=n -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 -CONFIG_FREERTOS_USE_TRACE_FACILITY=y -CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS=y -CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=y -CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y -CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y -CONFIG_FREERTOS_FPU_IN_ISR=y diff --git a/tools/unit-test-app/configs/freertos_options_s2 b/tools/unit-test-app/configs/freertos_options_s2 deleted file mode 100644 index c06addfa52..0000000000 --- a/tools/unit-test-app/configs/freertos_options_s2 +++ /dev/null @@ -1,21 +0,0 @@ -# This is a small set of tests where we enable as many as possible of the optional features -# in FreeRTOS that are gated behind config - -CONFIG_IDF_TARGET="esp32s2" -TEST_COMPONENTS=freertos - -CONFIG_FREERTOS_CORETIMER_1=y -CONFIG_FREERTOS_OPTIMIZED_SCHEDULER=n -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_ENABLE_STATIC_TASK_CLEAN_UP=y -CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=10 -CONFIG_FREERTOS_USE_TRACE_FACILITY=y -CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS=y -CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=y -CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y -CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y -CONFIG_FREERTOS_FPU_IN_ISR=y diff --git a/tools/unit-test-app/configs/psram b/tools/unit-test-app/configs/psram index f550a59836..8870f0b994 100644 --- a/tools/unit-test-app/configs/psram +++ b/tools/unit-test-app/configs/psram @@ -1,5 +1,5 @@ CONFIG_IDF_TARGET="esp32" -TEST_EXCLUDE_COMPONENTS=bt driver esp_hw_support esp_ipc esp_pm esp_system esp_timer spi_flash test_utils soc experimental_cpp_component esp-tls freertos sdmmc +TEST_EXCLUDE_COMPONENTS=bt driver esp_hw_support esp_ipc esp_pm esp_system esp_timer spi_flash test_utils soc experimental_cpp_component esp-tls sdmmc CONFIG_SPIRAM=y CONFIG_ESP_INT_WDT_TIMEOUT_MS=800 CONFIG_SPIRAM_OCCUPY_NO_HOST=y diff --git a/tools/unit-test-app/configs/psram_3 b/tools/unit-test-app/configs/psram_3 index d61e270efc..375d781f4b 100644 --- a/tools/unit-test-app/configs/psram_3 +++ b/tools/unit-test-app/configs/psram_3 @@ -1,5 +1,5 @@ CONFIG_IDF_TARGET="esp32" -TEST_COMPONENTS=driver freertos sdmmc +TEST_COMPONENTS=driver sdmmc CONFIG_SPIRAM=y CONFIG_ESP_INT_WDT_TIMEOUT_MS=800 CONFIG_SPIRAM_OCCUPY_NO_HOST=y diff --git a/tools/unit-test-app/configs/release b/tools/unit-test-app/configs/release index c48959fc34..7f208af2ad 100644 --- a/tools/unit-test-app/configs/release +++ b/tools/unit-test-app/configs/release @@ -1,5 +1,5 @@ CONFIG_IDF_TARGET="esp32" -TEST_COMPONENTS=freertos esp_hw_support esp_system esp_ipc esp_timer driver soc spi_flash vfs +TEST_COMPONENTS=esp_hw_support esp_system esp_ipc esp_timer driver soc spi_flash vfs CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y diff --git a/tools/unit-test-app/configs/release_2 b/tools/unit-test-app/configs/release_2 index b667b13bdf..8988678b67 100644 --- a/tools/unit-test-app/configs/release_2 +++ b/tools/unit-test-app/configs/release_2 @@ -1,6 +1,6 @@ # This config is split between targets since different component needs to be included (esp32, esp32s2) CONFIG_IDF_TARGET="esp32" -TEST_EXCLUDE_COMPONENTS=bt freertos esp_hw_support esp_ipc esp_pm esp_system esp_timer driver soc spi_flash vfs test_utils experimental_cpp_component +TEST_EXCLUDE_COMPONENTS=bt esp_hw_support esp_ipc esp_pm esp_system esp_timer driver soc spi_flash vfs test_utils experimental_cpp_component CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y diff --git a/tools/unit-test-app/configs/release_2_s2 b/tools/unit-test-app/configs/release_2_s2 index 5354f78f96..fe59e9a7d5 100644 --- a/tools/unit-test-app/configs/release_2_s2 +++ b/tools/unit-test-app/configs/release_2_s2 @@ -1,6 +1,6 @@ # This config is split between targets since different component needs to be excluded (esp32, esp32s2) CONFIG_IDF_TARGET="esp32s2" -TEST_EXCLUDE_COMPONENTS=bt freertos esp_hw_support esp_ipc esp_pm esp_system esp_timer driver soc spi_flash vfs test_utils experimental_cpp_component +TEST_EXCLUDE_COMPONENTS=bt esp_hw_support esp_ipc esp_pm esp_system esp_timer driver soc spi_flash vfs test_utils experimental_cpp_component CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y diff --git a/tools/unit-test-app/configs/release_c2 b/tools/unit-test-app/configs/release_c2 index e836324554..dfc01e9428 100644 --- a/tools/unit-test-app/configs/release_c2 +++ b/tools/unit-test-app/configs/release_c2 @@ -1,5 +1,5 @@ CONFIG_IDF_TARGET="esp32c2" -TEST_COMPONENTS=freertos esp_hw_support esp_system esp_ipc esp_timer driver soc spi_flash vfs sdmmc +TEST_COMPONENTS=esp_hw_support esp_system esp_ipc esp_timer driver soc spi_flash vfs sdmmc CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y diff --git a/tools/unit-test-app/configs/release_c3 b/tools/unit-test-app/configs/release_c3 index e5cc761843..9e438d4f17 100644 --- a/tools/unit-test-app/configs/release_c3 +++ b/tools/unit-test-app/configs/release_c3 @@ -1,5 +1,5 @@ CONFIG_IDF_TARGET="esp32c3" -TEST_COMPONENTS=freertos esp_hw_support esp_ipc esp_system esp_timer driver +TEST_COMPONENTS=esp_hw_support esp_ipc esp_system esp_timer driver CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y diff --git a/tools/unit-test-app/configs/release_s2 b/tools/unit-test-app/configs/release_s2 index 71e26b6e8f..9014edbae3 100644 --- a/tools/unit-test-app/configs/release_s2 +++ b/tools/unit-test-app/configs/release_s2 @@ -1,6 +1,6 @@ # This config is split between targets since different component needs to be included (esp32, esp32s2) CONFIG_IDF_TARGET="esp32s2" -TEST_COMPONENTS=freertos esp_hw_support esp_system esp_timer driver soc spi_flash vfs +TEST_COMPONENTS=esp_hw_support esp_system esp_timer driver soc spi_flash vfs CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y diff --git a/tools/unit-test-app/configs/release_s3 b/tools/unit-test-app/configs/release_s3 index bb50ddbf3f..bc0282af27 100644 --- a/tools/unit-test-app/configs/release_s3 +++ b/tools/unit-test-app/configs/release_s3 @@ -1,5 +1,5 @@ CONFIG_IDF_TARGET="esp32s3" -TEST_COMPONENTS=freertos esp_hw_support esp_system esp_ipc esp_timer driver soc spi_flash vfs +TEST_COMPONENTS=esp_hw_support esp_system esp_ipc esp_timer driver soc spi_flash vfs CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y diff --git a/tools/unit-test-app/configs/single_core b/tools/unit-test-app/configs/single_core index ef974638b8..55fdffe341 100644 --- a/tools/unit-test-app/configs/single_core +++ b/tools/unit-test-app/configs/single_core @@ -1,6 +1,6 @@ # This config is split between targets since different component needs to be included (esp32, esp32s2) CONFIG_IDF_TARGET="esp32" -TEST_COMPONENTS=freertos esp_hw_support esp_system esp_timer driver soc spi_flash vfs +TEST_COMPONENTS=esp_hw_support esp_system esp_timer driver soc spi_flash vfs CONFIG_MEMMAP_SMP=n CONFIG_FREERTOS_UNICORE=y CONFIG_ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY=y diff --git a/tools/unit-test-app/configs/single_core_2 b/tools/unit-test-app/configs/single_core_2 index ade7034957..011c3790bc 100644 --- a/tools/unit-test-app/configs/single_core_2 +++ b/tools/unit-test-app/configs/single_core_2 @@ -1,6 +1,6 @@ # This config is split between targets since different component needs to be excluded (esp32, esp32s2) CONFIG_IDF_TARGET="esp32" -TEST_EXCLUDE_COMPONENTS=bt freertos esp_hw_support esp_system esp_pm esp_ipc esp_timer driver soc spi_flash vfs test_utils experimental_cpp_component +TEST_EXCLUDE_COMPONENTS=bt esp_hw_support esp_system esp_pm esp_ipc esp_timer driver soc spi_flash vfs test_utils experimental_cpp_component CONFIG_MEMMAP_SMP=n CONFIG_FREERTOS_UNICORE=y CONFIG_ESP32_RTCDATA_IN_FAST_MEM=y diff --git a/tools/unit-test-app/configs/single_core_2_s2 b/tools/unit-test-app/configs/single_core_2_s2 index c56816e445..338ecf6e85 100644 --- a/tools/unit-test-app/configs/single_core_2_s2 +++ b/tools/unit-test-app/configs/single_core_2_s2 @@ -1,6 +1,6 @@ # This config is split between targets since different component needs to be excluded (esp32, esp32s2) CONFIG_IDF_TARGET="esp32s2" -TEST_EXCLUDE_COMPONENTS=bt freertos esp_hw_support esp_ipc esp_system esp_pm esp_timer driver soc spi_flash vfs experimental_cpp_component +TEST_EXCLUDE_COMPONENTS=bt esp_hw_support esp_ipc esp_system esp_pm esp_timer driver soc spi_flash vfs experimental_cpp_component CONFIG_MEMMAP_SMP=n CONFIG_FREERTOS_UNICORE=y CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM=y diff --git a/tools/unit-test-app/sdkconfig.defaults b/tools/unit-test-app/sdkconfig.defaults index 0e32c97821..3932be9a46 100644 --- a/tools/unit-test-app/sdkconfig.defaults +++ b/tools/unit-test-app/sdkconfig.defaults @@ -7,13 +7,10 @@ CONFIG_PARTITION_TABLE_FILENAME="partition_table_unit_test_app.csv" CONFIG_PARTITION_TABLE_OFFSET=0x8000 CONFIG_FREERTOS_HZ=1000 CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y -CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 -CONFIG_FREERTOS_USE_TRACE_FACILITY=y CONFIG_HEAP_POISONING_COMPREHENSIVE=y CONFIG_SPI_FLASH_ENABLE_COUNTERS=y CONFIG_ESP_TASK_WDT_INIT=n CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS=y -CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=7 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y CONFIG_COMPILER_STACK_CHECK=y CONFIG_ESP_TIMER_PROFILING=y @@ -23,6 +20,5 @@ CONFIG_SPI_MASTER_IN_IRAM=y CONFIG_EFUSE_VIRTUAL=y CONFIG_SPIRAM_BANKSWITCH_ENABLE=n CONFIG_UNITY_ENABLE_BACKTRACE_ON_FAIL=y -CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=3000 CONFIG_MQTT_TEST_BROKER_URI="mqtt://${EXAMPLE_MQTT_BROKER_TCP}" CONFIG_NVS_ASSERT_ERROR_CHECK=y