From 46c092c04a211ee4a0252d311578f6e5f653372c Mon Sep 17 00:00:00 2001 From: Marius Vikhammer Date: Fri, 16 Sep 2022 15:38:27 +0800 Subject: [PATCH] pthread: migrate unit tests to pytest test app --- components/pthread/test/CMakeLists.txt | 9 ---- .../pthread_unity_tests/CMakeLists.txt | 8 ++++ .../test_apps/pthread_unity_tests/README.md | 2 + .../pthread_unity_tests/main/CMakeLists.txt | 11 +++++ .../pthread_unity_tests/main/test_app_main.c | 45 +++++++++++++++++++ .../main}/test_cxx_cond_var.cpp | 5 +++ .../main}/test_cxx_std_future.cpp | 5 +++ .../pthread_unity_tests/main}/test_pthread.c | 5 +++ .../main}/test_pthread_cond_var.c | 5 +++ .../main}/test_pthread_cxx.cpp | 8 ++++ .../main}/test_pthread_local_storage.c | 8 +++- .../main}/test_pthread_rwlock.c | 10 +---- .../pytest_pthread_unity_tests.py | 35 +++++++++++++++ .../pthread_unity_tests/sdkconfig.ci.default | 0 .../sdkconfig.ci.single_core_esp32 | 2 + .../sdkconfig.ci.single_core_esp32s3 | 2 + .../pthread_unity_tests/sdkconfig.defaults | 2 + tools/unit-test-app/configs/default_2 | 2 +- tools/unit-test-app/configs/default_2_c2 | 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_32_2 | 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_2 | 2 +- tools/unit-test-app/configs/default_s3 | 2 +- tools/unit-test-app/configs/psram | 2 +- tools/unit-test-app/configs/psram_2 | 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 +- 40 files changed, 167 insertions(+), 41 deletions(-) delete mode 100644 components/pthread/test/CMakeLists.txt create mode 100644 components/pthread/test_apps/pthread_unity_tests/CMakeLists.txt create mode 100644 components/pthread/test_apps/pthread_unity_tests/README.md create mode 100644 components/pthread/test_apps/pthread_unity_tests/main/CMakeLists.txt create mode 100644 components/pthread/test_apps/pthread_unity_tests/main/test_app_main.c rename components/pthread/{test => test_apps/pthread_unity_tests/main}/test_cxx_cond_var.cpp (96%) rename components/pthread/{test => test_apps/pthread_unity_tests/main}/test_cxx_std_future.cpp (87%) rename components/pthread/{test => test_apps/pthread_unity_tests/main}/test_pthread.c (98%) rename components/pthread/{test => test_apps/pthread_unity_tests/main}/test_pthread_cond_var.c (95%) rename components/pthread/{test => test_apps/pthread_unity_tests/main}/test_pthread_cxx.cpp (95%) rename components/pthread/{test => test_apps/pthread_unity_tests/main}/test_pthread_local_storage.c (97%) rename components/pthread/{test => test_apps/pthread_unity_tests/main}/test_pthread_rwlock.c (96%) create mode 100644 components/pthread/test_apps/pthread_unity_tests/pytest_pthread_unity_tests.py create mode 100644 components/pthread/test_apps/pthread_unity_tests/sdkconfig.ci.default create mode 100644 components/pthread/test_apps/pthread_unity_tests/sdkconfig.ci.single_core_esp32 create mode 100644 components/pthread/test_apps/pthread_unity_tests/sdkconfig.ci.single_core_esp32s3 create mode 100644 components/pthread/test_apps/pthread_unity_tests/sdkconfig.defaults diff --git a/components/pthread/test/CMakeLists.txt b/components/pthread/test/CMakeLists.txt deleted file mode 100644 index 17bc3e8954..0000000000 --- a/components/pthread/test/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -set(sources "test_pthread.c" - "test_pthread_cond_var.c" - "test_pthread_local_storage.c" - "test_pthread_cxx.cpp" - "test_pthread_rwlock.c") - -idf_component_register(SRCS ${sources} - PRIV_REQUIRES cmock test_utils pthread esp_timer) -target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format") diff --git a/components/pthread/test_apps/pthread_unity_tests/CMakeLists.txt b/components/pthread/test_apps/pthread_unity_tests/CMakeLists.txt new file mode 100644 index 0000000000..510842cb6b --- /dev/null +++ b/components/pthread/test_apps/pthread_unity_tests/CMakeLists.txt @@ -0,0 +1,8 @@ +# The following lines of boilerplate have to be in your project's +# CMakeLists in this exact order for cmake to work correctly +cmake_minimum_required(VERSION 3.16) + +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") + +include($ENV{IDF_PATH}/tools/cmake/project.cmake) +project(test_pthread) diff --git a/components/pthread/test_apps/pthread_unity_tests/README.md b/components/pthread/test_apps/pthread_unity_tests/README.md new file mode 100644 index 0000000000..b5be4985c5 --- /dev/null +++ b/components/pthread/test_apps/pthread_unity_tests/README.md @@ -0,0 +1,2 @@ +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | diff --git a/components/pthread/test_apps/pthread_unity_tests/main/CMakeLists.txt b/components/pthread/test_apps/pthread_unity_tests/main/CMakeLists.txt new file mode 100644 index 0000000000..80ad2a8722 --- /dev/null +++ b/components/pthread/test_apps/pthread_unity_tests/main/CMakeLists.txt @@ -0,0 +1,11 @@ +set(sources "test_app_main.c" + "test_pthread.c" + "test_pthread_cond_var.c" + "test_pthread_local_storage.c" + "test_pthread_cxx.cpp" + "test_pthread_rwlock.c") + +idf_component_register(SRCS ${sources} + INCLUDE_DIRS "." + REQUIRES pthread esp_timer test_utils + WHOLE_ARCHIVE) diff --git a/components/pthread/test_apps/pthread_unity_tests/main/test_app_main.c b/components/pthread/test_apps/pthread_unity_tests/main/test_app_main.c new file mode 100644 index 0000000000..80036e7b9d --- /dev/null +++ b/components/pthread/test_apps/pthread_unity_tests/main/test_app_main.c @@ -0,0 +1,45 @@ +/* + * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "unity.h" +#include "unity_test_runner.h" +#include "esp_heap_caps.h" + + +// Some resources are lazy allocated (e.g. newlib locks), the threshold is left for that case +#define TEST_MEMORY_LEAK_THRESHOLD (-200) + +static size_t before_free_8bit; +static size_t before_free_32bit; + +static void check_leak(size_t before_free, size_t after_free, const char *type) +{ + ssize_t delta = after_free - before_free; + printf("MALLOC_CAP_%s: Before %u bytes free, After %u bytes free (delta %d)\n", type, before_free, after_free, delta); + TEST_ASSERT_MESSAGE(delta >= TEST_MEMORY_LEAK_THRESHOLD, "memory leak"); +} + +void setUp(void) +{ + before_free_8bit = heap_caps_get_free_size(MALLOC_CAP_8BIT); + before_free_32bit = heap_caps_get_free_size(MALLOC_CAP_32BIT); +} + + + +void tearDown(void) +{ + size_t after_free_8bit = heap_caps_get_free_size(MALLOC_CAP_8BIT); + size_t after_free_32bit = heap_caps_get_free_size(MALLOC_CAP_32BIT); + check_leak(before_free_8bit, after_free_8bit, "8BIT"); + check_leak(before_free_32bit, after_free_32bit, "32BIT"); +} + +void app_main(void) +{ + printf("Running pthread component unity tests\n"); + unity_run_menu(); +} diff --git a/components/pthread/test/test_cxx_cond_var.cpp b/components/pthread/test_apps/pthread_unity_tests/main/test_cxx_cond_var.cpp similarity index 96% rename from components/pthread/test/test_cxx_cond_var.cpp rename to components/pthread/test_apps/pthread_unity_tests/main/test_cxx_cond_var.cpp index 0225f60710..18c1e2692b 100644 --- a/components/pthread/test/test_cxx_cond_var.cpp +++ b/components/pthread/test_apps/pthread_unity_tests/main/test_cxx_cond_var.cpp @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Unlicense OR CC0-1.0 + */ #include #include #include diff --git a/components/pthread/test/test_cxx_std_future.cpp b/components/pthread/test_apps/pthread_unity_tests/main/test_cxx_std_future.cpp similarity index 87% rename from components/pthread/test/test_cxx_std_future.cpp rename to components/pthread/test_apps/pthread_unity_tests/main/test_cxx_std_future.cpp index 792ee89d41..58f4fcb0ba 100644 --- a/components/pthread/test/test_cxx_std_future.cpp +++ b/components/pthread/test_apps/pthread_unity_tests/main/test_cxx_std_future.cpp @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Unlicense OR CC0-1.0 + */ #include #include #include diff --git a/components/pthread/test/test_pthread.c b/components/pthread/test_apps/pthread_unity_tests/main/test_pthread.c similarity index 98% rename from components/pthread/test/test_pthread.c rename to components/pthread/test_apps/pthread_unity_tests/main/test_pthread.c index f58bbf849a..675d4208b2 100644 --- a/components/pthread/test/test_pthread.c +++ b/components/pthread/test_apps/pthread_unity_tests/main/test_pthread.c @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Unlicense OR CC0-1.0 + */ #include #include "freertos/FreeRTOS.h" diff --git a/components/pthread/test/test_pthread_cond_var.c b/components/pthread/test_apps/pthread_unity_tests/main/test_pthread_cond_var.c similarity index 95% rename from components/pthread/test/test_pthread_cond_var.c rename to components/pthread/test_apps/pthread_unity_tests/main/test_pthread_cond_var.c index 6cd18f5a61..00ad4d4f3a 100644 --- a/components/pthread/test/test_pthread_cond_var.c +++ b/components/pthread/test_apps/pthread_unity_tests/main/test_pthread_cond_var.c @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Unlicense OR CC0-1.0 + */ #include #include "unity.h" diff --git a/components/pthread/test/test_pthread_cxx.cpp b/components/pthread/test_apps/pthread_unity_tests/main/test_pthread_cxx.cpp similarity index 95% rename from components/pthread/test/test_pthread_cxx.cpp rename to components/pthread/test_apps/pthread_unity_tests/main/test_pthread_cxx.cpp index f7131bbf74..27dabd5e00 100644 --- a/components/pthread/test/test_pthread_cxx.cpp +++ b/components/pthread/test_apps/pthread_unity_tests/main/test_pthread_cxx.cpp @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Unlicense OR CC0-1.0 + */ #include #include #include @@ -135,5 +140,8 @@ TEST_CASE("pthread mix C/C++", "[pthread]") std::cout << "Join thread " << std::hex << t1.get_id() << std::endl; t1.join(); } + + /* Short delay to allow cleanup, avoid leaks */ + vTaskDelay(10); } #endif diff --git a/components/pthread/test/test_pthread_local_storage.c b/components/pthread/test_apps/pthread_unity_tests/main/test_pthread_local_storage.c similarity index 97% rename from components/pthread/test/test_pthread_local_storage.c rename to components/pthread/test_apps/pthread_unity_tests/main/test_pthread_local_storage.c index 1047f2f175..1ad96af5a5 100644 --- a/components/pthread/test/test_pthread_local_storage.c +++ b/components/pthread/test_apps/pthread_unity_tests/main/test_pthread_local_storage.c @@ -1,5 +1,11 @@ +/* + * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Unlicense OR CC0-1.0 + */ // Test pthread_create_key, pthread_delete_key, pthread_setspecific, pthread_getspecific #include +#include #include "unity.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" @@ -36,7 +42,7 @@ TEST_CASE("pthread local storage unique keys", "[pthread]") for (int i = 0; i < NUM_KEYS; i++) { TEST_ASSERT_EQUAL(0, pthread_key_create(&keys[i], NULL)); - printf("New key %d = %d\n", i, keys[i]); + printf("New key %d = %"PRIu32"\n", i, keys[i]); } for (int i = 0; i < NUM_KEYS; i++) { diff --git a/components/pthread/test/test_pthread_rwlock.c b/components/pthread/test_apps/pthread_unity_tests/main/test_pthread_rwlock.c similarity index 96% rename from components/pthread/test/test_pthread_rwlock.c rename to components/pthread/test_apps/pthread_unity_tests/main/test_pthread_rwlock.c index ce2a7a6330..06df0fcd8a 100644 --- a/components/pthread/test/test_pthread_rwlock.c +++ b/components/pthread/test_apps/pthread_unity_tests/main/test_pthread_rwlock.c @@ -1,13 +1,7 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * - * SPDX-License-Identifier: CC0 - * - * This example code is in the Public Domain (or CC0 licensed, at your option.) - * - * Unless required by applicable law or agreed to in writing, this - * software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - * CONDITIONS OF ANY KIND, either express or implied. + * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ #include "sdkconfig.h" diff --git a/components/pthread/test_apps/pthread_unity_tests/pytest_pthread_unity_tests.py b/components/pthread/test_apps/pthread_unity_tests/pytest_pthread_unity_tests.py new file mode 100644 index 0000000000..85722ea21b --- /dev/null +++ b/components/pthread/test_apps/pthread_unity_tests/pytest_pthread_unity_tests.py @@ -0,0 +1,35 @@ +# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD +# SPDX-License-Identifier: CC0-1.0 + +import pytest +from pytest_embedded import Dut + + +@pytest.mark.generic +@pytest.mark.supported_targets +@pytest.mark.parametrize( + 'config', + [ + 'default', + ], + indirect=True, +) +def test_pthread(dut: Dut) -> None: + dut.expect_exact('Press ENTER to see the list of tests') + dut.write('*') + dut.expect_unity_test_output(timeout=300) + + +@pytest.mark.generic +@pytest.mark.parametrize( + 'config', + [ + pytest.param('single_core_esp32', marks=[pytest.mark.esp32]), + pytest.param('single_core_esp32s3', marks=[pytest.mark.esp32s3]), + ], + indirect=True, +) +def test_pthread_single_core(dut: Dut) -> None: + dut.expect_exact('Press ENTER to see the list of tests') + dut.write('*') + dut.expect_unity_test_output(timeout=300) diff --git a/components/pthread/test_apps/pthread_unity_tests/sdkconfig.ci.default b/components/pthread/test_apps/pthread_unity_tests/sdkconfig.ci.default new file mode 100644 index 0000000000..e69de29bb2 diff --git a/components/pthread/test_apps/pthread_unity_tests/sdkconfig.ci.single_core_esp32 b/components/pthread/test_apps/pthread_unity_tests/sdkconfig.ci.single_core_esp32 new file mode 100644 index 0000000000..5262d9dafb --- /dev/null +++ b/components/pthread/test_apps/pthread_unity_tests/sdkconfig.ci.single_core_esp32 @@ -0,0 +1,2 @@ +CONFIG_IDF_TARGET="esp32" +CONFIG_FREERTOS_UNICORE=y diff --git a/components/pthread/test_apps/pthread_unity_tests/sdkconfig.ci.single_core_esp32s3 b/components/pthread/test_apps/pthread_unity_tests/sdkconfig.ci.single_core_esp32s3 new file mode 100644 index 0000000000..625306512f --- /dev/null +++ b/components/pthread/test_apps/pthread_unity_tests/sdkconfig.ci.single_core_esp32s3 @@ -0,0 +1,2 @@ +CONFIG_IDF_TARGET="esp32s3" +CONFIG_FREERTOS_UNICORE=y diff --git a/components/pthread/test_apps/pthread_unity_tests/sdkconfig.defaults b/components/pthread/test_apps/pthread_unity_tests/sdkconfig.defaults new file mode 100644 index 0000000000..7b19867521 --- /dev/null +++ b/components/pthread/test_apps/pthread_unity_tests/sdkconfig.defaults @@ -0,0 +1,2 @@ +# Some of the tests will starve the watchdog +CONFIG_ESP_TASK_WDT=n diff --git a/tools/unit-test-app/configs/default_2 b/tools/unit-test-app/configs/default_2 index 6dce46209c..bbf1475f3e 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 app_update freertos esp_hw_support esp_ipc esp_pm esp_system esp_timer driver heap pthread soc spi_flash vfs test_utils experimental_cpp_component +TEST_EXCLUDE_COMPONENTS=bt app_update freertos esp_hw_support esp_ipc esp_pm esp_system esp_timer driver heap soc spi_flash vfs test_utils experimental_cpp_component diff --git a/tools/unit-test-app/configs/default_2_c2 b/tools/unit-test-app/configs/default_2_c2 index 56520c011b..72a2c93879 100644 --- a/tools/unit-test-app/configs/default_2_c2 +++ b/tools/unit-test-app/configs/default_2_c2 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32c2" -TEST_COMPONENTS=app_trace bootloader_support console efuse esp_common esp_eth esp_event esp_hid esp_netif esp_phy esp_ringbuf esp_rom esp_wifi espcoredump hal lwip mdns mqtt newlib nvs_flash partition_table sdmmc spiffs +TEST_COMPONENTS=app_trace console efuse esp_common esp_eth esp_event esp_hid esp_netif esp_phy esp_ringbuf esp_rom esp_wifi espcoredump hal lwip mdns mqtt newlib nvs_flash partition_table sdmmc spiffs diff --git a/tools/unit-test-app/configs/default_2_c3 b/tools/unit-test-app/configs/default_2_c3 index c298798436..01cf74a066 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 app_update esp_pm freertos esp_hw_support esp_ipc esp_system esp_timer driver heap pthread soc spi_flash vfs lwip spiffs experimental_cpp_component perfmon test_utils +TEST_EXCLUDE_COMPONENTS=bt app_update esp_pm freertos esp_hw_support esp_ipc esp_system esp_timer driver heap 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 2094ab1dd5..2a34eb0c6b 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 app_update freertos esp_hw_support esp_ipc esp_pm esp_system esp_timer driver heap pthread soc spi_flash vfs experimental_cpp_component +TEST_EXCLUDE_COMPONENTS=bt app_update freertos esp_hw_support esp_ipc esp_pm esp_system esp_timer driver heap 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 2a8cd2d170..0cf5359969 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 app_update freertos esp32s3 esp_ipc esp_pm esp_system esp_timer driver heap pthread soc spi_flash vfs experimental_cpp_component test_utils +TEST_EXCLUDE_COMPONENTS=bt app_update freertos esp32s3 esp_ipc esp_pm esp_system esp_timer driver heap soc spi_flash vfs experimental_cpp_component test_utils diff --git a/tools/unit-test-app/configs/default_32_2 b/tools/unit-test-app/configs/default_32_2 index 4daf14d44d..7195921f25 100644 --- a/tools/unit-test-app/configs/default_32_2 +++ b/tools/unit-test-app/configs/default_32_2 @@ -1,4 +1,4 @@ # continue from default CONFIG_IDF_TARGET="esp32" -TEST_COMPONENTS=pthread soc spi_flash vfs +TEST_COMPONENTS=soc spi_flash vfs CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD=y diff --git a/tools/unit-test-app/configs/default_3_c2 b/tools/unit-test-app/configs/default_3_c2 index 3e5ad002b1..d516eea21d 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 bootloader_support console efuse esp_common esp_eth esp_event esp_hid esp_netif esp_phy esp_ringbuf esp_rom esp_wifi espcoredump hal lwip mdns mqtt newlib nvs_flash partition_table sdmmc spiffs freertos esp_hw_support esp_ipc esp_system esp_timer driver heap pthread soc spi_flash vfs +TEST_EXCLUDE_COMPONENTS=app_trace console efuse esp_common esp_eth esp_event esp_hid esp_netif esp_phy esp_ringbuf esp_rom esp_wifi espcoredump hal lwip mdns mqtt newlib nvs_flash partition_table sdmmc spiffs freertos esp_hw_support esp_ipc esp_system esp_timer driver heap soc spi_flash vfs diff --git a/tools/unit-test-app/configs/default_c2 b/tools/unit-test-app/configs/default_c2 index d99387e17e..3033b1cef8 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 heap pthread soc spi_flash vfs +TEST_COMPONENTS=freertos esp_hw_support esp_ipc esp_system esp_timer driver heap soc spi_flash vfs diff --git a/tools/unit-test-app/configs/default_c3 b/tools/unit-test-app/configs/default_c3 index 199f9b9b73..fe48965abf 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 heap pthread +TEST_COMPONENTS=freertos esp_hw_support esp_ipc esp_system esp_timer driver heap diff --git a/tools/unit-test-app/configs/default_s2_2 b/tools/unit-test-app/configs/default_s2_2 index 2b6e575693..6184e20dd3 100644 --- a/tools/unit-test-app/configs/default_s2_2 +++ b/tools/unit-test-app/configs/default_s2_2 @@ -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=pthread soc spi_flash vfs +TEST_COMPONENTS=soc spi_flash vfs diff --git a/tools/unit-test-app/configs/default_s3 b/tools/unit-test-app/configs/default_s3 index ba02479cdd..d39dd39f8e 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 heap pthread soc spi_flash vfs +TEST_COMPONENTS=freertos esp_hw_support esp_ipc esp_system esp_timer driver heap soc spi_flash vfs diff --git a/tools/unit-test-app/configs/psram b/tools/unit-test-app/configs/psram index 7f7b946125..b5d8dc18b5 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 app_update driver esp_hw_support esp_ipc esp_pm esp_system esp_timer spi_flash test_utils heap pthread soc experimental_cpp_component esp-tls freertos sdmmc +TEST_EXCLUDE_COMPONENTS=bt app_update driver esp_hw_support esp_ipc esp_pm esp_system esp_timer spi_flash test_utils heap soc experimental_cpp_component esp-tls freertos 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_2 b/tools/unit-test-app/configs/psram_2 index a00291e6ca..69f028cacf 100644 --- a/tools/unit-test-app/configs/psram_2 +++ b/tools/unit-test-app/configs/psram_2 @@ -1,5 +1,5 @@ CONFIG_IDF_TARGET="esp32" -TEST_COMPONENTS=esp_hw_support esp_ipc esp_system esp_timer spi_flash heap pthread soc +TEST_COMPONENTS=esp_hw_support esp_ipc esp_system esp_timer spi_flash heap soc 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 d9047f3af3..d6739ff95f 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 heap pthread soc spi_flash vfs +TEST_COMPONENTS=freertos esp_hw_support esp_system esp_ipc esp_timer driver heap 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 ff6954dd54..bfe8572019 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 app_update freertos esp_hw_support esp_ipc esp_pm esp_system esp_timer driver heap pthread soc spi_flash vfs test_utils experimental_cpp_component +TEST_EXCLUDE_COMPONENTS=bt app_update freertos esp_hw_support esp_ipc esp_pm esp_system esp_timer driver heap 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 e6ccd822d1..8cefb25eba 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 app_update freertos esp_hw_support esp_ipc esp_pm esp_system esp_timer driver heap pthread soc spi_flash vfs test_utils experimental_cpp_component +TEST_EXCLUDE_COMPONENTS=bt app_update freertos esp_hw_support esp_ipc esp_pm esp_system esp_timer driver heap 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 820ad4f26e..7005427151 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 heap pthread soc spi_flash vfs sdmmc +TEST_COMPONENTS=freertos esp_hw_support esp_system esp_ipc esp_timer driver heap 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 d020583b8e..4f96f6e161 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 heap pthread +TEST_COMPONENTS=freertos esp_hw_support esp_ipc esp_system esp_timer driver heap 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 e90ddd2d7a..8ef561462d 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 heap pthread soc spi_flash vfs +TEST_COMPONENTS=freertos esp_hw_support esp_system esp_timer driver heap 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 3d7d7a0a1b..022c6665f4 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 heap pthread soc spi_flash vfs +TEST_COMPONENTS=freertos esp_hw_support esp_system esp_ipc esp_timer driver heap 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 9e4a54c0f0..fc734c5df7 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 heap pthread soc spi_flash vfs +TEST_COMPONENTS=freertos esp_hw_support esp_system esp_timer driver heap 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 01fe4ee3bb..4df28be5ea 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 app_update freertos esp_hw_support esp_system esp_pm esp_ipc esp_timer driver heap pthread soc spi_flash vfs test_utils experimental_cpp_component +TEST_EXCLUDE_COMPONENTS=bt app_update freertos esp_hw_support esp_system esp_pm esp_ipc esp_timer driver heap 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 8c04334541..241a56affb 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 app_update freertos esp_hw_support esp_ipc esp_system esp_pm esp_timer driver heap pthread soc spi_flash vfs experimental_cpp_component +TEST_EXCLUDE_COMPONENTS=bt app_update freertos esp_hw_support esp_ipc esp_system esp_pm esp_timer driver heap soc spi_flash vfs experimental_cpp_component CONFIG_MEMMAP_SMP=n CONFIG_FREERTOS_UNICORE=y CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM=y