From d83c6810780e01ac62daccae053bf374449f47bb Mon Sep 17 00:00:00 2001 From: Sonika Rathi Date: Thu, 6 Apr 2023 20:32:23 +0530 Subject: [PATCH] VFS: move tests from unit-test-app to a component test app --- components/vfs/test/CMakeLists.txt | 3 -- components/vfs/test_apps/CMakeLists.txt | 12 +++++++ components/vfs/test_apps/README.md | 3 ++ components/vfs/test_apps/main/CMakeLists.txt | 12 +++++++ components/vfs/test_apps/main/test_app_main.c | 34 ++++++++++++++++++ .../main}/test_vfs_access.c | 2 +- .../main}/test_vfs_append.c | 1 - .../main}/test_vfs_eventfd.c | 0 .../{test => test_apps/main}/test_vfs_fd.c | 0 .../{test => test_apps/main}/test_vfs_lwip.c | 18 +++------- .../{test => test_apps/main}/test_vfs_open.c | 2 +- .../{test => test_apps/main}/test_vfs_paths.c | 18 +++------- .../main}/test_vfs_select.c | 0 .../{test => test_apps/main}/test_vfs_uart.c | 0 components/vfs/test_apps/partitions.csv | 5 +++ components/vfs/test_apps/pytest_vfs.py | 36 +++++++++++++++++++ components/vfs/test_apps/sdkconfig.ci.ccomp | 1 + components/vfs/test_apps/sdkconfig.ci.default | 0 components/vfs/test_apps/sdkconfig.ci.psram | 3 ++ components/vfs/test_apps/sdkconfig.defaults | 9 +++++ .../vfs/test_apps/sdkconfig.defaults.esp32 | 1 + 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_32_2 | 2 +- tools/unit-test-app/configs/default_3_c2 | 2 +- tools/unit-test-app/configs/default_3_c3 | 2 +- tools/unit-test-app/configs/default_3_c6 | 2 +- tools/unit-test-app/configs/default_3_h2 | 2 +- tools/unit-test-app/configs/default_c2 | 2 +- tools/unit-test-app/configs/default_c6 | 2 +- tools/unit-test-app/configs/default_h2 | 2 +- tools/unit-test-app/configs/default_s2_2 | 2 +- tools/unit-test-app/configs/default_s3 | 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 | 2 +- tools/unit-test-app/configs/release_c6 | 2 +- tools/unit-test-app/configs/release_h2 | 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 +- 47 files changed, 154 insertions(+), 58 deletions(-) delete mode 100644 components/vfs/test/CMakeLists.txt create mode 100644 components/vfs/test_apps/CMakeLists.txt create mode 100644 components/vfs/test_apps/README.md create mode 100644 components/vfs/test_apps/main/CMakeLists.txt create mode 100644 components/vfs/test_apps/main/test_app_main.c rename components/vfs/{test => test_apps/main}/test_vfs_access.c (99%) rename components/vfs/{test => test_apps/main}/test_vfs_append.c (99%) rename components/vfs/{test => test_apps/main}/test_vfs_eventfd.c (100%) rename components/vfs/{test => test_apps/main}/test_vfs_fd.c (100%) rename components/vfs/{test => test_apps/main}/test_vfs_lwip.c (51%) rename components/vfs/{test => test_apps/main}/test_vfs_open.c (91%) rename components/vfs/{test => test_apps/main}/test_vfs_paths.c (93%) rename components/vfs/{test => test_apps/main}/test_vfs_select.c (100%) rename components/vfs/{test => test_apps/main}/test_vfs_uart.c (100%) create mode 100644 components/vfs/test_apps/partitions.csv create mode 100644 components/vfs/test_apps/pytest_vfs.py create mode 100644 components/vfs/test_apps/sdkconfig.ci.ccomp create mode 100644 components/vfs/test_apps/sdkconfig.ci.default create mode 100644 components/vfs/test_apps/sdkconfig.ci.psram create mode 100644 components/vfs/test_apps/sdkconfig.defaults create mode 100644 components/vfs/test_apps/sdkconfig.defaults.esp32 diff --git a/components/vfs/test/CMakeLists.txt b/components/vfs/test/CMakeLists.txt deleted file mode 100644 index ef84a7ff17..0000000000 --- a/components/vfs/test/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -idf_component_register(SRC_DIRS "." - PRIV_INCLUDE_DIRS . - PRIV_REQUIRES cmock test_utils vfs fatfs spiffs) diff --git a/components/vfs/test_apps/CMakeLists.txt b/components/vfs/test_apps/CMakeLists.txt new file mode 100644 index 0000000000..2d493b33b3 --- /dev/null +++ b/components/vfs/test_apps/CMakeLists.txt @@ -0,0 +1,12 @@ +# This is the project CMakeLists.txt file for the test subproject +cmake_minimum_required(VERSION 3.5) + +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") + +list(APPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers") +list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults") + +set(COMPONENTS main) + +include($ENV{IDF_PATH}/tools/cmake/project.cmake) +project(vfs_test) diff --git a/components/vfs/test_apps/README.md b/components/vfs/test_apps/README.md new file mode 100644 index 0000000000..0d3b8c0661 --- /dev/null +++ b/components/vfs/test_apps/README.md @@ -0,0 +1,3 @@ +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | + diff --git a/components/vfs/test_apps/main/CMakeLists.txt b/components/vfs/test_apps/main/CMakeLists.txt new file mode 100644 index 0000000000..d0d0f826d2 --- /dev/null +++ b/components/vfs/test_apps/main/CMakeLists.txt @@ -0,0 +1,12 @@ +set(src "test_app_main.c" "test_vfs_access.c" + "test_vfs_append.c" "test_vfs_eventfd.c" + "test_vfs_fd.c" "test_vfs_lwip.c" + "test_vfs_open.c" "test_vfs_paths.c" + "test_vfs_select.c" "test_vfs_uart.c" + ) + +idf_component_register(SRCS ${src} + PRIV_INCLUDE_DIRS . + PRIV_REQUIRES test_utils vfs fatfs spiffs unity lwip wear_levelling cmock + WHOLE_ARCHIVE + ) diff --git a/components/vfs/test_apps/main/test_app_main.c b/components/vfs/test_apps/main/test_app_main.c new file mode 100644 index 0000000000..68da20b42c --- /dev/null +++ b/components/vfs/test_apps/main/test_app_main.c @@ -0,0 +1,34 @@ +/* + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Unlicense OR CC0-1.0 + */ + +#include "unity.h" +#include "unity_test_utils.h" +#include "esp_heap_caps.h" + +// Some resources are lazy allocated, the threadhold is left for that case +#define TEST_MEMORY_LEAK_THRESHOLD (-100) + +static size_t before_free_8bit; +static size_t before_free_32bit; + +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); + unity_utils_check_leak(before_free_8bit, after_free_8bit, "8BIT", TEST_MEMORY_LEAK_THRESHOLD); + unity_utils_check_leak(before_free_32bit, after_free_32bit, "32BIT", TEST_MEMORY_LEAK_THRESHOLD); +} + +void app_main(void) +{ + unity_run_menu(); +} diff --git a/components/vfs/test/test_vfs_access.c b/components/vfs/test_apps/main/test_vfs_access.c similarity index 99% rename from components/vfs/test/test_vfs_access.c rename to components/vfs/test_apps/main/test_vfs_access.c index f76d1de7a3..5098111255 100644 --- a/components/vfs/test/test_vfs_access.c +++ b/components/vfs/test_apps/main/test_vfs_access.c @@ -14,7 +14,7 @@ #include "esp_vfs_dev.h" #include "esp_vfs_fat.h" #include "wear_levelling.h" -#include "test_utils.h" +#include "sdkconfig.h" static wl_handle_t test_wl_handle; diff --git a/components/vfs/test/test_vfs_append.c b/components/vfs/test_apps/main/test_vfs_append.c similarity index 99% rename from components/vfs/test/test_vfs_append.c rename to components/vfs/test_apps/main/test_vfs_append.c index 0a951ea490..80aa8e5f95 100644 --- a/components/vfs/test/test_vfs_append.c +++ b/components/vfs/test_apps/main/test_vfs_append.c @@ -13,7 +13,6 @@ #include "esp_vfs_fat.h" #include "esp_spiffs.h" #include "wear_levelling.h" -#include "test_utils.h" #define TEST_PARTITION_LABEL "flash_test" diff --git a/components/vfs/test/test_vfs_eventfd.c b/components/vfs/test_apps/main/test_vfs_eventfd.c similarity index 100% rename from components/vfs/test/test_vfs_eventfd.c rename to components/vfs/test_apps/main/test_vfs_eventfd.c diff --git a/components/vfs/test/test_vfs_fd.c b/components/vfs/test_apps/main/test_vfs_fd.c similarity index 100% rename from components/vfs/test/test_vfs_fd.c rename to components/vfs/test_apps/main/test_vfs_fd.c diff --git a/components/vfs/test/test_vfs_lwip.c b/components/vfs/test_apps/main/test_vfs_lwip.c similarity index 51% rename from components/vfs/test/test_vfs_lwip.c rename to components/vfs/test_apps/main/test_vfs_lwip.c index 064bb46d33..3bed7d5ec8 100644 --- a/components/vfs/test/test_vfs_lwip.c +++ b/components/vfs/test_apps/main/test_vfs_lwip.c @@ -1,16 +1,8 @@ -// Copyright 2021 Espressif Systems (Shanghai) CO LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include #include diff --git a/components/vfs/test/test_vfs_open.c b/components/vfs/test_apps/main/test_vfs_open.c similarity index 91% rename from components/vfs/test/test_vfs_open.c rename to components/vfs/test_apps/main/test_vfs_open.c index 4db1a386ba..7b888d83b4 100644 --- a/components/vfs/test/test_vfs_open.c +++ b/components/vfs/test_apps/main/test_vfs_open.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/vfs/test/test_vfs_paths.c b/components/vfs/test_apps/main/test_vfs_paths.c similarity index 93% rename from components/vfs/test/test_vfs_paths.c rename to components/vfs/test_apps/main/test_vfs_paths.c index f7071d2624..ed9ce374c7 100644 --- a/components/vfs/test/test_vfs_paths.c +++ b/components/vfs/test_apps/main/test_vfs_paths.c @@ -1,16 +1,8 @@ -// Copyright 2015-2017 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include #include diff --git a/components/vfs/test/test_vfs_select.c b/components/vfs/test_apps/main/test_vfs_select.c similarity index 100% rename from components/vfs/test/test_vfs_select.c rename to components/vfs/test_apps/main/test_vfs_select.c diff --git a/components/vfs/test/test_vfs_uart.c b/components/vfs/test_apps/main/test_vfs_uart.c similarity index 100% rename from components/vfs/test/test_vfs_uart.c rename to components/vfs/test_apps/main/test_vfs_uart.c diff --git a/components/vfs/test_apps/partitions.csv b/components/vfs/test_apps/partitions.csv new file mode 100644 index 0000000000..b31d4e80fd --- /dev/null +++ b/components/vfs/test_apps/partitions.csv @@ -0,0 +1,5 @@ +# Name, Type, SubType, Offset, Size, Flags +# Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap +nvs, data, nvs, 0x9000, 0x6000, +factory, 0, 0, 0x10000, 1M +flash_test, data, fat, , 528K diff --git a/components/vfs/test_apps/pytest_vfs.py b/components/vfs/test_apps/pytest_vfs.py new file mode 100644 index 0000000000..d2e7d97f31 --- /dev/null +++ b/components/vfs/test_apps/pytest_vfs.py @@ -0,0 +1,36 @@ +# SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD +# SPDX-License-Identifier: CC0-1.0 + +import pytest +from pytest_embedded import Dut + + +@pytest.mark.esp32c2 +@pytest.mark.esp32c3 +@pytest.mark.esp32c6 +@pytest.mark.esp32h2 +@pytest.mark.generic +@pytest.mark.parametrize('config', [ + 'default', +], indirect=True) +def test_vfs_default(dut: Dut) -> None: + dut.run_all_single_board_cases() + + +@pytest.mark.esp32 +@pytest.mark.esp32s2 +@pytest.mark.generic +@pytest.mark.parametrize('config', [ + 'ccomp', +], indirect=True) +def test_vfs_ccomp(dut: Dut) -> None: + dut.run_all_single_board_cases() + + +@pytest.mark.esp32s3 +@pytest.mark.quad_psram +@pytest.mark.parametrize('config', [ + 'psram', +], indirect=True) +def test_vfs_psram(dut: Dut) -> None: + dut.run_all_single_board_cases() diff --git a/components/vfs/test_apps/sdkconfig.ci.ccomp b/components/vfs/test_apps/sdkconfig.ci.ccomp new file mode 100644 index 0000000000..7382da578e --- /dev/null +++ b/components/vfs/test_apps/sdkconfig.ci.ccomp @@ -0,0 +1 @@ +CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y diff --git a/components/vfs/test_apps/sdkconfig.ci.default b/components/vfs/test_apps/sdkconfig.ci.default new file mode 100644 index 0000000000..e69de29bb2 diff --git a/components/vfs/test_apps/sdkconfig.ci.psram b/components/vfs/test_apps/sdkconfig.ci.psram new file mode 100644 index 0000000000..e831880d07 --- /dev/null +++ b/components/vfs/test_apps/sdkconfig.ci.psram @@ -0,0 +1,3 @@ +CONFIG_SPIRAM=y +CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0 +CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y diff --git a/components/vfs/test_apps/sdkconfig.defaults b/components/vfs/test_apps/sdkconfig.defaults new file mode 100644 index 0000000000..728b21c79f --- /dev/null +++ b/components/vfs/test_apps/sdkconfig.defaults @@ -0,0 +1,9 @@ +# Enable Unity fixture support +CONFIG_UNITY_ENABLE_FIXTURE=n +CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y + +# Custom partition table for this test app +CONFIG_PARTITION_TABLE_CUSTOM=y +CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" + +CONFIG_ESP_TASK_WDT_INIT=n diff --git a/components/vfs/test_apps/sdkconfig.defaults.esp32 b/components/vfs/test_apps/sdkconfig.defaults.esp32 new file mode 100644 index 0000000000..7382da578e --- /dev/null +++ b/components/vfs/test_apps/sdkconfig.defaults.esp32 @@ -0,0 +1 @@ +CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y diff --git a/tools/unit-test-app/configs/default_2 b/tools/unit-test-app/configs/default_2 index cf9a9f6ba7..d20bb2378d 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 driver soc spi_flash vfs test_utils +TEST_EXCLUDE_COMPONENTS=bt driver soc spi_flash test_utils diff --git a/tools/unit-test-app/configs/default_2_c3 b/tools/unit-test-app/configs/default_2_c3 index b616c20afc..bb1a39c869 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 driver soc spi_flash vfs lwip spiffs perfmon test_utils +TEST_EXCLUDE_COMPONENTS=bt driver soc spi_flash lwip spiffs perfmon test_utils diff --git a/tools/unit-test-app/configs/default_2_s2 b/tools/unit-test-app/configs/default_2_s2 index 1e97a22606..c97fa6b736 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 driver soc spi_flash vfs +TEST_EXCLUDE_COMPONENTS=bt driver soc spi_flash diff --git a/tools/unit-test-app/configs/default_2_s3 b/tools/unit-test-app/configs/default_2_s3 index fe9151ec06..450667deec 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 esp32s3 driver soc spi_flash vfs test_utils +TEST_EXCLUDE_COMPONENTS=bt esp32s3 driver soc spi_flash test_utils diff --git a/tools/unit-test-app/configs/default_32_2 b/tools/unit-test-app/configs/default_32_2 index 14df8e218d..fcd0d474b7 100644 --- a/tools/unit-test-app/configs/default_32_2 +++ b/tools/unit-test-app/configs/default_32_2 @@ -1,3 +1,3 @@ # continue from default CONFIG_IDF_TARGET="esp32" -TEST_COMPONENTS=spi_flash vfs +TEST_COMPONENTS=spi_flash diff --git a/tools/unit-test-app/configs/default_3_c2 b/tools/unit-test-app/configs/default_3_c2 index f611140920..a534f7a34e 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 esp_eth esp_hid esp_netif esp_phy esp_ringbuf esp_wifi espcoredump hal lwip mdns newlib nvs_flash partition_table sdmmc driver soc spi_flash vfs +TEST_EXCLUDE_COMPONENTS=app_trace esp_eth esp_hid esp_netif esp_phy esp_ringbuf esp_wifi espcoredump hal lwip mdns newlib nvs_flash partition_table sdmmc driver soc spi_flash diff --git a/tools/unit-test-app/configs/default_3_c3 b/tools/unit-test-app/configs/default_3_c3 index f22b9b3573..d052f2b07e 100644 --- a/tools/unit-test-app/configs/default_3_c3 +++ b/tools/unit-test-app/configs/default_3_c3 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32c3" -TEST_COMPONENTS=spi_flash vfs lwip +TEST_COMPONENTS=spi_flash lwip diff --git a/tools/unit-test-app/configs/default_3_c6 b/tools/unit-test-app/configs/default_3_c6 index 9f7a34ebf4..93dddf3dc0 100644 --- a/tools/unit-test-app/configs/default_3_c6 +++ b/tools/unit-test-app/configs/default_3_c6 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32c6" -TEST_EXCLUDE_COMPONENTS=app_trace esp_eth esp_hid esp_netif esp_phy esp_ringbuf esp_wifi espcoredump hal lwip mdns newlib nvs_flash partition_table sdmmc driver soc spi_flash vfs +TEST_EXCLUDE_COMPONENTS=app_trace esp_eth esp_hid esp_netif esp_phy esp_ringbuf esp_wifi espcoredump hal lwip mdns newlib nvs_flash partition_table sdmmc driver soc spi_flash diff --git a/tools/unit-test-app/configs/default_3_h2 b/tools/unit-test-app/configs/default_3_h2 index 6768e9bbda..5d08b4c849 100644 --- a/tools/unit-test-app/configs/default_3_h2 +++ b/tools/unit-test-app/configs/default_3_h2 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32h2" -TEST_EXCLUDE_COMPONENTS=app_trace esp_eth esp_hid esp_netif esp_phy esp_ringbuf esp_wifi espcoredump hal lwip mdns newlib nvs_flash partition_table sdmmc driver soc spi_flash vfs +TEST_EXCLUDE_COMPONENTS=app_trace esp_eth esp_hid esp_netif esp_phy esp_ringbuf esp_wifi espcoredump hal lwip mdns newlib nvs_flash partition_table sdmmc driver soc spi_flash diff --git a/tools/unit-test-app/configs/default_c2 b/tools/unit-test-app/configs/default_c2 index 487363ca98..3c6f283201 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= soc spi_flash vfs +TEST_COMPONENTS= soc spi_flash diff --git a/tools/unit-test-app/configs/default_c6 b/tools/unit-test-app/configs/default_c6 index 8f2019e797..cd6893058f 100644 --- a/tools/unit-test-app/configs/default_c6 +++ b/tools/unit-test-app/configs/default_c6 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32c6" -TEST_COMPONENTS=spi_flash vfs +TEST_COMPONENTS=spi_flash diff --git a/tools/unit-test-app/configs/default_h2 b/tools/unit-test-app/configs/default_h2 index 2cc7af9aba..df6d7d32b5 100644 --- a/tools/unit-test-app/configs/default_h2 +++ b/tools/unit-test-app/configs/default_h2 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32h2" -TEST_COMPONENTS=spi_flash vfs +TEST_COMPONENTS=spi_flash diff --git a/tools/unit-test-app/configs/default_s2_2 b/tools/unit-test-app/configs/default_s2_2 index 4103557a86..5da4ddf3c9 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=spi_flash vfs +TEST_COMPONENTS=spi_flash diff --git a/tools/unit-test-app/configs/default_s3 b/tools/unit-test-app/configs/default_s3 index dc62b0164a..3a11263a72 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=spi_flash vfs +TEST_COMPONENTS=spi_flash diff --git a/tools/unit-test-app/configs/release b/tools/unit-test-app/configs/release index 0236c008d3..eac3b84181 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=driver soc spi_flash vfs +TEST_COMPONENTS=driver soc spi_flash 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 ef45279257..a36bef2d8b 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 driver soc spi_flash vfs test_utils +TEST_EXCLUDE_COMPONENTS=bt driver soc spi_flash test_utils 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 e6e36db140..8c84bbbd57 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 driver soc spi_flash vfs test_utils +TEST_EXCLUDE_COMPONENTS=bt driver soc spi_flash test_utils 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 01bffeef7b..cb647f9dce 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=spi_flash vfs sdmmc +TEST_COMPONENTS=spi_flash 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_2 b/tools/unit-test-app/configs/release_c3_2 index bbf6433010..d7ed117c20 100644 --- a/tools/unit-test-app/configs/release_c3_2 +++ b/tools/unit-test-app/configs/release_c3_2 @@ -1,5 +1,5 @@ CONFIG_IDF_TARGET="esp32c3" -TEST_COMPONENTS=spi_flash vfs sdmmc +TEST_COMPONENTS=spi_flash 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_c6 b/tools/unit-test-app/configs/release_c6 index a4b1822715..da88354695 100644 --- a/tools/unit-test-app/configs/release_c6 +++ b/tools/unit-test-app/configs/release_c6 @@ -1,5 +1,5 @@ CONFIG_IDF_TARGET="esp32c6" -TEST_COMPONENTS=esp_ipc spi_flash vfs sdmmc +TEST_COMPONENTS=esp_ipc spi_flash 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_h2 b/tools/unit-test-app/configs/release_h2 index ee18d87d01..132fb82f95 100644 --- a/tools/unit-test-app/configs/release_h2 +++ b/tools/unit-test-app/configs/release_h2 @@ -1,5 +1,5 @@ CONFIG_IDF_TARGET="esp32h2" -TEST_COMPONENTS=esp_ipc spi_flash vfs sdmmc +TEST_COMPONENTS=esp_ipc spi_flash 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_s2 b/tools/unit-test-app/configs/release_s2 index 5cd7e89e91..5d9f72d254 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=spi_flash vfs +TEST_COMPONENTS=spi_flash 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 43452f1189..846a8c2999 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=spi_flash vfs +TEST_COMPONENTS=spi_flash 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 7f01ca6c87..fd500c98c1 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=spi_flash vfs +TEST_COMPONENTS=spi_flash CONFIG_FREERTOS_UNICORE=y CONFIG_ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY=y CONFIG_ESP32_RTCDATA_IN_FAST_MEM=y diff --git a/tools/unit-test-app/configs/single_core_2 b/tools/unit-test-app/configs/single_core_2 index 84758221a6..66ca7b9c3e 100644 --- a/tools/unit-test-app/configs/single_core_2 +++ b/tools/unit-test-app/configs/single_core_2 @@ -1,5 +1,5 @@ # This config is split between targets since different component needs to be excluded (esp32, esp32s2) CONFIG_IDF_TARGET="esp32" -TEST_EXCLUDE_COMPONENTS=bt driver soc spi_flash vfs test_utils +TEST_EXCLUDE_COMPONENTS=bt driver soc spi_flash test_utils 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 d1206c577f..34e433363d 100644 --- a/tools/unit-test-app/configs/single_core_2_s2 +++ b/tools/unit-test-app/configs/single_core_2_s2 @@ -1,5 +1,5 @@ # This config is split between targets since different component needs to be excluded (esp32, esp32s2) CONFIG_IDF_TARGET="esp32s2" -TEST_EXCLUDE_COMPONENTS=bt driver soc spi_flash vfs +TEST_EXCLUDE_COMPONENTS=bt driver soc spi_flash CONFIG_FREERTOS_UNICORE=y CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM=y