diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS index 815576c30f..e62e5cc917 100644 --- a/.gitlab/CODEOWNERS +++ b/.gitlab/CODEOWNERS @@ -230,15 +230,16 @@ /tools/test_apps/README.md @esp-idf-codeowners/docs @esp-idf-codeowners/ci ## Note: owners here should be the same as the owners for the same example subdir, above -/tools/test_apps/build_system/ @esp-idf-codeowners/build-config -/tools/test_apps/configs/ @esp-idf-codeowners/system -/tools/test_apps/linux_compatible/ @esp-idf-codeowners/system -/tools/test_apps/peripherals/ @esp-idf-codeowners/peripherals -/tools/test_apps/phy/ @esp-idf-codeowners/bluetooth @esp-idf-codeowners/wifi @esp-idf-codeowners/ieee802154 -/tools/test_apps/protocols/ @esp-idf-codeowners/network @esp-idf-codeowners/app-utilities -/tools/test_apps/security/ @esp-idf-codeowners/security -/tools/test_apps/storage/ @esp-idf-codeowners/storage -/tools/test_apps/system/ @esp-idf-codeowners/system +/tools/test_apps/build_system/ @esp-idf-codeowners/build-config +/tools/test_apps/components/test_utils/ @esp-idf-codeowners/peripherals @esp-idf-codeowners/system +/tools/test_apps/configs/ @esp-idf-codeowners/system +/tools/test_apps/linux_compatible/ @esp-idf-codeowners/system +/tools/test_apps/peripherals/ @esp-idf-codeowners/peripherals +/tools/test_apps/phy/ @esp-idf-codeowners/bluetooth @esp-idf-codeowners/wifi @esp-idf-codeowners/ieee802154 +/tools/test_apps/protocols/ @esp-idf-codeowners/network @esp-idf-codeowners/app-utilities +/tools/test_apps/security/ @esp-idf-codeowners/security +/tools/test_apps/storage/ @esp-idf-codeowners/storage +/tools/test_apps/system/ @esp-idf-codeowners/system /tools/test_apps/**/*.py @esp-idf-codeowners/ci @esp-idf-codeowners/tools diff --git a/components/app_update/test_apps/test_app_update/CMakeLists.txt b/components/app_update/test_apps/test_app_update/CMakeLists.txt index 35fff8ca41..dc5ddbc260 100644 --- a/components/app_update/test_apps/test_app_update/CMakeLists.txt +++ b/components/app_update/test_apps/test_app_update/CMakeLists.txt @@ -1,7 +1,7 @@ #This is the project CMakeLists.txt file for the test subproject cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") set(COMPONENTS main) include($ENV{IDF_PATH}/tools/cmake/project.cmake) diff --git a/components/driver/test_apps/legacy_i2c_driver/CMakeLists.txt b/components/driver/test_apps/legacy_i2c_driver/CMakeLists.txt index 447256e12b..9582c4507a 100644 --- a/components/driver/test_apps/legacy_i2c_driver/CMakeLists.txt +++ b/components/driver/test_apps/legacy_i2c_driver/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16) set(EXTRA_COMPONENT_DIRS - "$ENV{IDF_PATH}/tools/unit-test-app/components" + "$ENV{IDF_PATH}/tools/test_apps/components" ) # "Trim" the build. Include the minimal set of components, main, and anything it depends on. We also depend on esp_pm diff --git a/components/esp-tls/test_apps/CMakeLists.txt b/components/esp-tls/test_apps/CMakeLists.txt index a7ae249d6e..9e39527482 100644 --- a/components/esp-tls/test_apps/CMakeLists.txt +++ b/components/esp-tls/test_apps/CMakeLists.txt @@ -1,7 +1,7 @@ #This is the project CMakeLists.txt file for the test subproject cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") set(COMPONENTS main) include($ENV{IDF_PATH}/tools/cmake/project.cmake) diff --git a/components/esp_adc/test_apps/adc/CMakeLists.txt b/components/esp_adc/test_apps/adc/CMakeLists.txt index 9534f2424b..0b4f8e808b 100644 --- a/components/esp_adc/test_apps/adc/CMakeLists.txt +++ b/components/esp_adc/test_apps/adc/CMakeLists.txt @@ -1,7 +1,7 @@ # This is the project CMakeLists.txt file for the test subproject cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") # "Trim" the build. Include the minimal set of components, main, and anything it depends on. set(COMPONENTS main) diff --git a/components/esp_driver_bitscrambler/test_apps/bitscrambler/CMakeLists.txt b/components/esp_driver_bitscrambler/test_apps/bitscrambler/CMakeLists.txt index 15b0569b51..3a8b2f1f68 100644 --- a/components/esp_driver_bitscrambler/test_apps/bitscrambler/CMakeLists.txt +++ b/components/esp_driver_bitscrambler/test_apps/bitscrambler/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16) -list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") set(COMPONENTS main) diff --git a/components/esp_driver_cam/test_apps/csi/CMakeLists.txt b/components/esp_driver_cam/test_apps/csi/CMakeLists.txt index b8463898a6..de39c5f777 100644 --- a/components/esp_driver_cam/test_apps/csi/CMakeLists.txt +++ b/components/esp_driver_cam/test_apps/csi/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16) -list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") set(COMPONENTS main) diff --git a/components/esp_driver_cam/test_apps/dvp/CMakeLists.txt b/components/esp_driver_cam/test_apps/dvp/CMakeLists.txt index d49275de91..d1eedadb18 100644 --- a/components/esp_driver_cam/test_apps/dvp/CMakeLists.txt +++ b/components/esp_driver_cam/test_apps/dvp/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16) -list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") set(COMPONENTS main) diff --git a/components/esp_driver_i2c/test_apps/i2c_test_apps/CMakeLists.txt b/components/esp_driver_i2c/test_apps/i2c_test_apps/CMakeLists.txt index 5588fca271..adabc5998f 100644 --- a/components/esp_driver_i2c/test_apps/i2c_test_apps/CMakeLists.txt +++ b/components/esp_driver_i2c/test_apps/i2c_test_apps/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.16) set(COMPONENTS main) set(EXTRA_COMPONENT_DIRS - "$ENV{IDF_PATH}/tools/unit-test-app/components" + "$ENV{IDF_PATH}/tools/test_apps/components" ) include($ENV{IDF_PATH}/tools/cmake/project.cmake) diff --git a/components/esp_driver_i2s/test_apps/i2s_multi_dev/CMakeLists.txt b/components/esp_driver_i2s/test_apps/i2s_multi_dev/CMakeLists.txt index fa66d91f0e..2c494b492e 100644 --- a/components/esp_driver_i2s/test_apps/i2s_multi_dev/CMakeLists.txt +++ b/components/esp_driver_i2s/test_apps/i2s_multi_dev/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.16) set(COMPONENTS main) set(EXTRA_COMPONENT_DIRS - "$ENV{IDF_PATH}/tools/unit-test-app/components" + "$ENV{IDF_PATH}/tools/test_apps/components" ) include($ENV{IDF_PATH}/tools/cmake/project.cmake) diff --git a/components/esp_driver_isp/test_apps/isp/CMakeLists.txt b/components/esp_driver_isp/test_apps/isp/CMakeLists.txt index 62a2bf08e1..f3f19f7b53 100644 --- a/components/esp_driver_isp/test_apps/isp/CMakeLists.txt +++ b/components/esp_driver_isp/test_apps/isp/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16) -list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") set(COMPONENTS main) diff --git a/components/esp_driver_jpeg/test_apps/jpeg_test_apps/CMakeLists.txt b/components/esp_driver_jpeg/test_apps/jpeg_test_apps/CMakeLists.txt index 8e38f175ba..a5b09c1373 100644 --- a/components/esp_driver_jpeg/test_apps/jpeg_test_apps/CMakeLists.txt +++ b/components/esp_driver_jpeg/test_apps/jpeg_test_apps/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) # "Trim" the build. Include the minimal set of components, main, and anything it depends on. set(COMPONENTS main) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(jpeg_test) diff --git a/components/esp_driver_ledc/test_apps/ledc/main/idf_component.yml b/components/esp_driver_ledc/test_apps/ledc/main/idf_component.yml index f5001494e2..d5f58e5fa9 100644 --- a/components/esp_driver_ledc/test_apps/ledc/main/idf_component.yml +++ b/components/esp_driver_ledc/test_apps/ledc/main/idf_component.yml @@ -1,3 +1,3 @@ dependencies: test_utils: - path: ${IDF_PATH}/tools/unit-test-app/components/test_utils + path: ${IDF_PATH}/tools/test_apps/components/test_utils diff --git a/components/esp_driver_sdio/test_apps/sdio/sdio_common_tests/host_sdmmc/CMakeLists.txt b/components/esp_driver_sdio/test_apps/sdio/sdio_common_tests/host_sdmmc/CMakeLists.txt index 5c2d9f84cb..7061780c84 100644 --- a/components/esp_driver_sdio/test_apps/sdio/sdio_common_tests/host_sdmmc/CMakeLists.txt +++ b/components/esp_driver_sdio/test_apps/sdio/sdio_common_tests/host_sdmmc/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.16) set(COMPONENTS main) set(EXTRA_COMPONENT_DIRS - "$ENV{IDF_PATH}/tools/unit-test-app/components" + "$ENV{IDF_PATH}/tools/test_apps/components" "$ENV{IDF_PATH}/components/driver/test_apps/components" ) diff --git a/components/esp_driver_sdio/test_apps/sdio/sdio_common_tests/sdio/CMakeLists.txt b/components/esp_driver_sdio/test_apps/sdio/sdio_common_tests/sdio/CMakeLists.txt index f5becedb87..fa8e22d3ec 100644 --- a/components/esp_driver_sdio/test_apps/sdio/sdio_common_tests/sdio/CMakeLists.txt +++ b/components/esp_driver_sdio/test_apps/sdio/sdio_common_tests/sdio/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.16) set(COMPONENTS main) set(EXTRA_COMPONENT_DIRS - "$ENV{IDF_PATH}/tools/unit-test-app/components" + "$ENV{IDF_PATH}/tools/test_apps/components" "$ENV{IDF_PATH}/components/driver/test_apps/components" ) diff --git a/components/esp_driver_sdmmc/test_apps/sdmmc/CMakeLists.txt b/components/esp_driver_sdmmc/test_apps/sdmmc/CMakeLists.txt index 614cf9cd42..49186bdb51 100644 --- a/components/esp_driver_sdmmc/test_apps/sdmmc/CMakeLists.txt +++ b/components/esp_driver_sdmmc/test_apps/sdmmc/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16) -list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/components/esp_driver_sdmmc/test_apps/sd_test_utils/components") set(COMPONENTS main) diff --git a/components/esp_driver_sdspi/test_apps/sdspi/CMakeLists.txt b/components/esp_driver_sdspi/test_apps/sdspi/CMakeLists.txt index 2725c2f9ad..14c492e2d2 100644 --- a/components/esp_driver_sdspi/test_apps/sdspi/CMakeLists.txt +++ b/components/esp_driver_sdspi/test_apps/sdspi/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16) -list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/components/esp_driver_sdmmc/test_apps/sd_test_utils/components") list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests") diff --git a/components/esp_driver_spi/test_apps/master/main/idf_component.yml b/components/esp_driver_spi/test_apps/master/main/idf_component.yml index 3e1127ae0f..8df35e1a3b 100644 --- a/components/esp_driver_spi/test_apps/master/main/idf_component.yml +++ b/components/esp_driver_spi/test_apps/master/main/idf_component.yml @@ -1,6 +1,6 @@ dependencies: test_utils: - path: ${IDF_PATH}/tools/unit-test-app/components/test_utils + path: ${IDF_PATH}/tools/test_apps/components/test_utils test_driver_utils: path: ${IDF_PATH}/components/driver/test_apps/components/test_driver_utils spi_bench_mark: diff --git a/components/esp_driver_spi/test_apps/param/main/idf_component.yml b/components/esp_driver_spi/test_apps/param/main/idf_component.yml index 5a95a369b8..a7b3269c80 100644 --- a/components/esp_driver_spi/test_apps/param/main/idf_component.yml +++ b/components/esp_driver_spi/test_apps/param/main/idf_component.yml @@ -1,6 +1,6 @@ dependencies: test_utils: - path: ${IDF_PATH}/tools/unit-test-app/components/test_utils + path: ${IDF_PATH}/tools/test_apps/components/test_utils test_driver_utils: path: ${IDF_PATH}/components/driver/test_apps/components/test_driver_utils spi_bench_mark: diff --git a/components/esp_driver_spi/test_apps/slave/main/idf_component.yml b/components/esp_driver_spi/test_apps/slave/main/idf_component.yml index 7a92181a68..2b47e115a3 100644 --- a/components/esp_driver_spi/test_apps/slave/main/idf_component.yml +++ b/components/esp_driver_spi/test_apps/slave/main/idf_component.yml @@ -1,5 +1,5 @@ dependencies: test_utils: - path: ${IDF_PATH}/tools/unit-test-app/components/test_utils + path: ${IDF_PATH}/tools/test_apps/components/test_utils test_driver_utils: path: ${IDF_PATH}/components/driver/test_apps/components/test_driver_utils diff --git a/components/esp_driver_spi/test_apps/slave_hd/main/idf_component.yml b/components/esp_driver_spi/test_apps/slave_hd/main/idf_component.yml index cf247b0f7c..c4fea9f147 100644 --- a/components/esp_driver_spi/test_apps/slave_hd/main/idf_component.yml +++ b/components/esp_driver_spi/test_apps/slave_hd/main/idf_component.yml @@ -1,6 +1,6 @@ dependencies: test_utils: - path: ${IDF_PATH}/tools/unit-test-app/components/test_utils + path: ${IDF_PATH}/tools/test_apps/components/test_utils test_driver_utils: path: ${IDF_PATH}/components/driver/test_apps/components/test_driver_utils espressif/esp_serial_slave_link: "^1.1.0" diff --git a/components/esp_driver_tsens/test_apps/temperature_sensor/CMakeLists.txt b/components/esp_driver_tsens/test_apps/temperature_sensor/CMakeLists.txt index 1f76355f32..88e33ecd87 100644 --- a/components/esp_driver_tsens/test_apps/temperature_sensor/CMakeLists.txt +++ b/components/esp_driver_tsens/test_apps/temperature_sensor/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16) set(EXTRA_COMPONENT_DIRS - "$ENV{IDF_PATH}/tools/unit-test-app/components" + "$ENV{IDF_PATH}/tools/test_apps/components" ) # "Trim" the build. Include the minimal set of components, main, and anything it depends on. diff --git a/components/esp_driver_twai/test_apps/test_twai/main/idf_component.yml b/components/esp_driver_twai/test_apps/test_twai/main/idf_component.yml index f5001494e2..d5f58e5fa9 100644 --- a/components/esp_driver_twai/test_apps/test_twai/main/idf_component.yml +++ b/components/esp_driver_twai/test_apps/test_twai/main/idf_component.yml @@ -1,3 +1,3 @@ dependencies: test_utils: - path: ${IDF_PATH}/tools/unit-test-app/components/test_utils + path: ${IDF_PATH}/tools/test_apps/components/test_utils diff --git a/components/esp_driver_uart/test_apps/rs485/CMakeLists.txt b/components/esp_driver_uart/test_apps/rs485/CMakeLists.txt index 20e715e839..a455220c06 100644 --- a/components/esp_driver_uart/test_apps/rs485/CMakeLists.txt +++ b/components/esp_driver_uart/test_apps/rs485/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) # "Trim" the build. Include the minimal set of components, main, and anything it depends on. set(COMPONENTS main) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(rs485_test) diff --git a/components/esp_driver_uart/test_apps/uart/CMakeLists.txt b/components/esp_driver_uart/test_apps/uart/CMakeLists.txt index 8b31eea32e..69cd3de629 100644 --- a/components/esp_driver_uart/test_apps/uart/CMakeLists.txt +++ b/components/esp_driver_uart/test_apps/uart/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) # "Trim" the build. Include the minimal set of components, main, and anything it depends on. set(COMPONENTS main) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(uart_test) diff --git a/components/esp_driver_uart/test_apps/uart_vfs/CMakeLists.txt b/components/esp_driver_uart/test_apps/uart_vfs/CMakeLists.txt index f1ff90157f..f51eb3fa33 100644 --- a/components/esp_driver_uart/test_apps/uart_vfs/CMakeLists.txt +++ b/components/esp_driver_uart/test_apps/uart_vfs/CMakeLists.txt @@ -1,7 +1,7 @@ # 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") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults") diff --git a/components/esp_driver_uart/test_apps/uhci/CMakeLists.txt b/components/esp_driver_uart/test_apps/uhci/CMakeLists.txt index 1c824f4877..02811d16ee 100644 --- a/components/esp_driver_uart/test_apps/uhci/CMakeLists.txt +++ b/components/esp_driver_uart/test_apps/uhci/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) # "Trim" the build. Include the minimal set of components, main, and anything it depends on. set(COMPONENTS main) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(uhci_test) diff --git a/components/esp_driver_usb_serial_jtag/test_apps/usb_serial_jtag_vfs/CMakeLists.txt b/components/esp_driver_usb_serial_jtag/test_apps/usb_serial_jtag_vfs/CMakeLists.txt index 7e13de758f..dd81eb5f93 100644 --- a/components/esp_driver_usb_serial_jtag/test_apps/usb_serial_jtag_vfs/CMakeLists.txt +++ b/components/esp_driver_usb_serial_jtag/test_apps/usb_serial_jtag_vfs/CMakeLists.txt @@ -1,7 +1,7 @@ # 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") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults") diff --git a/components/esp_eth/test_apps/CMakeLists.txt b/components/esp_eth/test_apps/CMakeLists.txt index 66d496fdf0..87e50a9563 100644 --- a/components/esp_eth/test_apps/CMakeLists.txt +++ b/components/esp_eth/test_apps/CMakeLists.txt @@ -1,7 +1,7 @@ # This is the project CMakeLists.txt file for the test subproject cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(esp_eth_test) diff --git a/components/esp_event/test_apps/CMakeLists.txt b/components/esp_event/test_apps/CMakeLists.txt index 320d15895c..dc63f6191f 100644 --- a/components/esp_event/test_apps/CMakeLists.txt +++ b/components/esp_event/test_apps/CMakeLists.txt @@ -9,6 +9,6 @@ list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfi # "Trim" the build. Include the minimal set of components, main, and anything it depends on. set(COMPONENTS main) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") project(test_esp_event) diff --git a/components/esp_http_client/test_apps/CMakeLists.txt b/components/esp_http_client/test_apps/CMakeLists.txt index c1475171d7..cca464c617 100644 --- a/components/esp_http_client/test_apps/CMakeLists.txt +++ b/components/esp_http_client/test_apps/CMakeLists.txt @@ -1,7 +1,7 @@ #This is the project CMakeLists.txt file for the test subproject cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") set(COMPONENTS main) include($ENV{IDF_PATH}/tools/cmake/project.cmake) diff --git a/components/esp_http_server/test_apps/CMakeLists.txt b/components/esp_http_server/test_apps/CMakeLists.txt index ac7ac108f5..1e1c7926d4 100644 --- a/components/esp_http_server/test_apps/CMakeLists.txt +++ b/components/esp_http_server/test_apps/CMakeLists.txt @@ -1,7 +1,7 @@ #This is the project CMakeLists.txt file for the test subproject cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") set(COMPONENTS main) include($ENV{IDF_PATH}/tools/cmake/project.cmake) diff --git a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/CMakeLists.txt b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/CMakeLists.txt index c6bda239bd..6b37ce15dc 100644 --- a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/CMakeLists.txt +++ b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16) set(COMPONENTS main) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults") diff --git a/components/esp_hw_support/test_apps/mspi_psram_with_dfs/CMakeLists.txt b/components/esp_hw_support/test_apps/mspi_psram_with_dfs/CMakeLists.txt index 75826523ec..7a3631c840 100644 --- a/components/esp_hw_support/test_apps/mspi_psram_with_dfs/CMakeLists.txt +++ b/components/esp_hw_support/test_apps/mspi_psram_with_dfs/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) include($ENV{IDF_PATH}/tools/cmake/project.cmake) list(APPEND EXTRA_COMPONENT_DIRS - "$ENV{IDF_PATH}/tools/unit-test-app/components") # For test_utils component + "$ENV{IDF_PATH}/tools/test_apps/components") # For test_utils component # "Trim" the build. Include the minimal set of components, main, and anything it depends on. We also depend on # esptool_py and esp_psram as we set CONFIG_ESPTOOLPY_... and CONFIG_SPIRAM_... options. diff --git a/components/esp_hw_support/test_apps/rtc_clk/CMakeLists.txt b/components/esp_hw_support/test_apps/rtc_clk/CMakeLists.txt index 5a2c96430b..1b53dfa3bb 100644 --- a/components/esp_hw_support/test_apps/rtc_clk/CMakeLists.txt +++ b/components/esp_hw_support/test_apps/rtc_clk/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16) set(COMPONENTS main) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults") diff --git a/components/esp_hw_support/test_apps/wakeup_tests/CMakeLists.txt b/components/esp_hw_support/test_apps/wakeup_tests/CMakeLists.txt index 703608f645..271ac5e121 100644 --- a/components/esp_hw_support/test_apps/wakeup_tests/CMakeLists.txt +++ b/components/esp_hw_support/test_apps/wakeup_tests/CMakeLists.txt @@ -8,6 +8,6 @@ list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfi # "Trim" the build. Include the minimal set of components, main, and anything it depends on. set(COMPONENTS main) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") project(wakeup_tests) diff --git a/components/esp_mm/test_apps/mm/main/idf_component.yml b/components/esp_mm/test_apps/mm/main/idf_component.yml index f5001494e2..d5f58e5fa9 100644 --- a/components/esp_mm/test_apps/mm/main/idf_component.yml +++ b/components/esp_mm/test_apps/mm/main/idf_component.yml @@ -1,3 +1,3 @@ dependencies: test_utils: - path: ${IDF_PATH}/tools/unit-test-app/components/test_utils + path: ${IDF_PATH}/tools/test_apps/components/test_utils diff --git a/components/esp_mm/test_apps/mmap_hw/CMakeLists.txt b/components/esp_mm/test_apps/mmap_hw/CMakeLists.txt index 8cfc84f6ee..2960e4dbb6 100644 --- a/components/esp_mm/test_apps/mmap_hw/CMakeLists.txt +++ b/components/esp_mm/test_apps/mmap_hw/CMakeLists.txt @@ -1,7 +1,7 @@ # This is the project CMakeLists.txt file for the test subproject cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") # "Trim" the build. Include the minimal set of components, main, and anything it depends on. set(COMPONENTS main) diff --git a/components/esp_netif/test_apps/test_app_esp_netif/CMakeLists.txt b/components/esp_netif/test_apps/test_app_esp_netif/CMakeLists.txt index c90b2d947c..35ca392d91 100644 --- a/components/esp_netif/test_apps/test_app_esp_netif/CMakeLists.txt +++ b/components/esp_netif/test_apps/test_app_esp_netif/CMakeLists.txt @@ -1,7 +1,7 @@ # This is the project CMakeLists.txt file for the test subproject cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") # "Trim" the build. Include the minimal set of components, main, and anything it depends on. set(COMPONENTS main) diff --git a/components/esp_netif/test_apps/test_app_vfs_l2tap/CMakeLists.txt b/components/esp_netif/test_apps/test_app_vfs_l2tap/CMakeLists.txt index e046158b43..e6ca375d85 100644 --- a/components/esp_netif/test_apps/test_app_vfs_l2tap/CMakeLists.txt +++ b/components/esp_netif/test_apps/test_app_vfs_l2tap/CMakeLists.txt @@ -1,7 +1,7 @@ # This is the project CMakeLists.txt file for the test subproject cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") # "Trim" the build. Include the minimal set of components, main, and anything it depends on. set(COMPONENTS main) diff --git a/components/esp_security/test_apps/crypto_drivers/CMakeLists.txt b/components/esp_security/test_apps/crypto_drivers/CMakeLists.txt index 2eca4621cf..0b2bfe8cac 100644 --- a/components/esp_security/test_apps/crypto_drivers/CMakeLists.txt +++ b/components/esp_security/test_apps/crypto_drivers/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.16) set(COMPONENTS main) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") include($ENV{IDF_PATH}/tools/cmake/project.cmake) diff --git a/components/esp_system/test_apps/esp_system_unity_tests/CMakeLists.txt b/components/esp_system/test_apps/esp_system_unity_tests/CMakeLists.txt index 1dabba76a0..42b39804f5 100644 --- a/components/esp_system/test_apps/esp_system_unity_tests/CMakeLists.txt +++ b/components/esp_system/test_apps/esp_system_unity_tests/CMakeLists.txt @@ -8,6 +8,6 @@ list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfi # "Trim" the build. Include the minimal set of components, main, and anything it depends on. set(COMPONENTS main) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") project(test_esp_system_unity_tests) diff --git a/components/esp_tee/test_apps/tee_test_fw/main/idf_component.yml b/components/esp_tee/test_apps/tee_test_fw/main/idf_component.yml index 7b62e998be..0388ba85eb 100644 --- a/components/esp_tee/test_apps/tee_test_fw/main/idf_component.yml +++ b/components/esp_tee/test_apps/tee_test_fw/main/idf_component.yml @@ -7,4 +7,4 @@ dependencies: tee_sec_storage: path: ${IDF_PATH}/components/esp_tee/subproject/components/tee_sec_storage test_utils: - path: ${IDF_PATH}/tools/unit-test-app/components/test_utils + path: ${IDF_PATH}/tools/test_apps/components/test_utils diff --git a/components/esp_timer/test_apps/CMakeLists.txt b/components/esp_timer/test_apps/CMakeLists.txt index 200a66a8d0..efe41a26de 100644 --- a/components/esp_timer/test_apps/CMakeLists.txt +++ b/components/esp_timer/test_apps/CMakeLists.txt @@ -5,7 +5,7 @@ list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfi # "Trim" the build. Include the minimal set of components, main, and anything it depends on. set(COMPONENTS main) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(esp_timer_test) diff --git a/components/esp_wifi/test_apps/wifi_connect/CMakeLists.txt b/components/esp_wifi/test_apps/wifi_connect/CMakeLists.txt index 4d7035c22b..157349931c 100644 --- a/components/esp_wifi/test_apps/wifi_connect/CMakeLists.txt +++ b/components/esp_wifi/test_apps/wifi_connect/CMakeLists.txt @@ -1,7 +1,7 @@ #This is the project CMakeLists.txt file for the test subproject cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") # "Trim" the build. Include the minimal set of components, main, and anything it depends on. set(COMPONENTS main) diff --git a/components/esp_wifi/test_apps/wifi_function/CMakeLists.txt b/components/esp_wifi/test_apps/wifi_function/CMakeLists.txt index 1707a7102c..29a1068b5a 100644 --- a/components/esp_wifi/test_apps/wifi_function/CMakeLists.txt +++ b/components/esp_wifi/test_apps/wifi_function/CMakeLists.txt @@ -1,7 +1,7 @@ #This is the project CMakeLists.txt file for the test subproject cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") # "Trim" the build. Include the minimal set of components, main, and anything it depends on. set(COMPONENTS main) diff --git a/components/esp_wifi/test_apps/wifi_nvs_config/CMakeLists.txt b/components/esp_wifi/test_apps/wifi_nvs_config/CMakeLists.txt index fb176510b8..6330846783 100644 --- a/components/esp_wifi/test_apps/wifi_nvs_config/CMakeLists.txt +++ b/components/esp_wifi/test_apps/wifi_nvs_config/CMakeLists.txt @@ -1,7 +1,7 @@ #This is the project CMakeLists.txt file for the test subproject cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") # "Trim" the build. Include the minimal set of components, main, and anything it depends on. set(COMPONENTS main) diff --git a/components/freertos/test_apps/freertos/CMakeLists.txt b/components/freertos/test_apps/freertos/CMakeLists.txt index 02b26ae0ac..f6cefb6375 100644 --- a/components/freertos/test_apps/freertos/CMakeLists.txt +++ b/components/freertos/test_apps/freertos/CMakeLists.txt @@ -7,7 +7,7 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake) # - test_utils component # - the different test types (e.g., kernel, port, performance, ...) that are organized as components set(EXTRA_COMPONENT_DIRS - "$ENV{IDF_PATH}/tools/unit-test-app/components" + "$ENV{IDF_PATH}/tools/test_apps/components" "./kernel" "./misc" "./performance" diff --git a/components/hal/test_apps/crypto/CMakeLists.txt b/components/hal/test_apps/crypto/CMakeLists.txt index 8ad50fab6e..066bdb536f 100644 --- a/components/hal/test_apps/crypto/CMakeLists.txt +++ b/components/hal/test_apps/crypto/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16) set(COMPONENTS main) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") include($ENV{IDF_PATH}/tools/cmake/project.cmake) diff --git a/components/hal/test_apps/tee_apm/main/idf_component.yml b/components/hal/test_apps/tee_apm/main/idf_component.yml index c0428d208c..d7d0639788 100644 --- a/components/hal/test_apps/tee_apm/main/idf_component.yml +++ b/components/hal/test_apps/tee_apm/main/idf_component.yml @@ -1,4 +1,4 @@ dependencies: ccomp_timer: "^1.0.0" test_utils: - path: ${IDF_PATH}/tools/unit-test-app/components/test_utils + path: ${IDF_PATH}/tools/test_apps/components/test_utils diff --git a/components/lwip/test_apps/CMakeLists.txt b/components/lwip/test_apps/CMakeLists.txt index a6cce379eb..75d38efc20 100644 --- a/components/lwip/test_apps/CMakeLists.txt +++ b/components/lwip/test_apps/CMakeLists.txt @@ -1,7 +1,7 @@ # This is the project CMakeLists.txt file for the test subproject cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") set(COMPONENTS main) include($ENV{IDF_PATH}/tools/cmake/project.cmake) diff --git a/components/mbedtls/test_apps/CMakeLists.txt b/components/mbedtls/test_apps/CMakeLists.txt index 813f3a6946..d523568754 100644 --- a/components/mbedtls/test_apps/CMakeLists.txt +++ b/components/mbedtls/test_apps/CMakeLists.txt @@ -1,7 +1,7 @@ #This is the project CMakeLists.txt file for the test subproject cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") #"Trim" the build. Include the minimal set of components, main, and anything it depends on. set(COMPONENTS main) diff --git a/components/mqtt/test_apps/test_mqtt/CMakeLists.txt b/components/mqtt/test_apps/test_mqtt/CMakeLists.txt index bc86bdba3e..bde2a66a91 100644 --- a/components/mqtt/test_apps/test_mqtt/CMakeLists.txt +++ b/components/mqtt/test_apps/test_mqtt/CMakeLists.txt @@ -1,7 +1,7 @@ #This is the project CMakeLists.txt file for the test subproject cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components" +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components" "../common") set(COMPONENTS main) diff --git a/components/mqtt/test_apps/test_mqtt5/CMakeLists.txt b/components/mqtt/test_apps/test_mqtt5/CMakeLists.txt index 1c7881c5ad..9a56a3e9ca 100644 --- a/components/mqtt/test_apps/test_mqtt5/CMakeLists.txt +++ b/components/mqtt/test_apps/test_mqtt5/CMakeLists.txt @@ -1,7 +1,7 @@ #This is the project CMakeLists.txt file for the test subproject cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components" +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components" "../common") set(COMPONENTS main) diff --git a/components/newlib/test_apps/newlib/CMakeLists.txt b/components/newlib/test_apps/newlib/CMakeLists.txt index a288fe07f5..102b2aa899 100644 --- a/components/newlib/test_apps/newlib/CMakeLists.txt +++ b/components/newlib/test_apps/newlib/CMakeLists.txt @@ -1,7 +1,7 @@ # This is the project CMakeLists.txt file for the test subproject cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(newlib_test) diff --git a/components/nvs_flash/test_apps/CMakeLists.txt b/components/nvs_flash/test_apps/CMakeLists.txt index 6fbd6b2ff4..c2fc03610a 100644 --- a/components/nvs_flash/test_apps/CMakeLists.txt +++ b/components/nvs_flash/test_apps/CMakeLists.txt @@ -1,7 +1,7 @@ #This is the project CMakeLists.txt file for the test subproject cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") set(COMPONENTS main mbedtls) list(APPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers") diff --git a/components/nvs_flash/test_apps_bootloader/CMakeLists.txt b/components/nvs_flash/test_apps_bootloader/CMakeLists.txt index d0cf30b7e6..47be4ce7e9 100644 --- a/components/nvs_flash/test_apps_bootloader/CMakeLists.txt +++ b/components/nvs_flash/test_apps_bootloader/CMakeLists.txt @@ -2,7 +2,7 @@ # 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") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") # set(BOOT_DIR "$ENV{IDF_PATH}/components/nvs_flash/bootloader_test/bootloader_components/nvs_bootloader") # set(BOOT_TEST_DIR "$ENV{IDF_PATH}/components/nvs_flash/bootloader_test/bootloader_components/nvs_bootloader_test") diff --git a/components/protocomm/test_apps/CMakeLists.txt b/components/protocomm/test_apps/CMakeLists.txt index b0356c1b2d..b876cca26c 100644 --- a/components/protocomm/test_apps/CMakeLists.txt +++ b/components/protocomm/test_apps/CMakeLists.txt @@ -1,7 +1,7 @@ #This is the project CMakeLists.txt file for the test subproject cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") set(COMPONENTS main) include($ENV{IDF_PATH}/tools/cmake/project.cmake) diff --git a/components/pthread/test_apps/pthread_psram_tests/CMakeLists.txt b/components/pthread/test_apps/pthread_psram_tests/CMakeLists.txt index d1038c898c..fe4a9c10b6 100644 --- a/components/pthread/test_apps/pthread_psram_tests/CMakeLists.txt +++ b/components/pthread/test_apps/pthread_psram_tests/CMakeLists.txt @@ -8,6 +8,6 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake) set(COMPONENTS main esp_psram) -list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") # For test_utils component +list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") # For test_utils component project(pthread_psram_tests) diff --git a/components/pthread/test_apps/pthread_unity_tests/CMakeLists.txt b/components/pthread/test_apps/pthread_unity_tests/CMakeLists.txt index 479850e764..0123220bc6 100644 --- a/components/pthread/test_apps/pthread_unity_tests/CMakeLists.txt +++ b/components/pthread/test_apps/pthread_unity_tests/CMakeLists.txt @@ -2,7 +2,7 @@ # 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") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") include($ENV{IDF_PATH}/tools/cmake/project.cmake) set(COMPONENTS main) diff --git a/components/spi_flash/test_apps/esp_flash/CMakeLists.txt b/components/spi_flash/test_apps/esp_flash/CMakeLists.txt index 889416b847..c60470c3b8 100644 --- a/components/spi_flash/test_apps/esp_flash/CMakeLists.txt +++ b/components/spi_flash/test_apps/esp_flash/CMakeLists.txt @@ -1,7 +1,7 @@ # This is the project CMakeLists.txt file for the test subproject cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") # "Trim" the build. Include the minimal set of components, main, and anything it depends on. We also depend on # esptool_py as we set CONFIG_ESPTOOLPY_... options. diff --git a/components/spi_flash/test_apps/flash_encryption/CMakeLists.txt b/components/spi_flash/test_apps/flash_encryption/CMakeLists.txt index 660c0194c3..18d194c69a 100644 --- a/components/spi_flash/test_apps/flash_encryption/CMakeLists.txt +++ b/components/spi_flash/test_apps/flash_encryption/CMakeLists.txt @@ -8,7 +8,7 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake) set(COMPONENTS main esp_psram esptool_py) set(EXTRA_COMPONENT_DIRS - "$ENV{IDF_PATH}/tools/unit-test-app/components" + "$ENV{IDF_PATH}/tools/test_apps/components" "$ENV{IDF_PATH}/components/spi_flash/test_apps/components" ) diff --git a/components/spi_flash/test_apps/flash_mmap/CMakeLists.txt b/components/spi_flash/test_apps/flash_mmap/CMakeLists.txt index 716f502a83..ecf3df7244 100644 --- a/components/spi_flash/test_apps/flash_mmap/CMakeLists.txt +++ b/components/spi_flash/test_apps/flash_mmap/CMakeLists.txt @@ -1,7 +1,7 @@ # This is the project CMakeLists.txt file for the test subproject cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") # "Trim" the build. Include the minimal set of components, main, and anything it depends on. We also depend on esp_psram # as we set CONFIG_SPIRAM_... options. diff --git a/components/spi_flash/test_apps/flash_suspend/CMakeLists.txt b/components/spi_flash/test_apps/flash_suspend/CMakeLists.txt index 03504ecd6a..def71536f8 100644 --- a/components/spi_flash/test_apps/flash_suspend/CMakeLists.txt +++ b/components/spi_flash/test_apps/flash_suspend/CMakeLists.txt @@ -1,7 +1,7 @@ # This is the project CMakeLists.txt file for the test subproject cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") # "Trim" the build. Include the minimal set of components, main, and anything it depends on. set(COMPONENTS main) diff --git a/components/tcp_transport/test_apps/CMakeLists.txt b/components/tcp_transport/test_apps/CMakeLists.txt index cad519eb86..685e7a2b19 100644 --- a/components/tcp_transport/test_apps/CMakeLists.txt +++ b/components/tcp_transport/test_apps/CMakeLists.txt @@ -1,7 +1,7 @@ #This is the project CMakeLists.txt file for the test subproject cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") set(COMPONENTS main) include($ENV{IDF_PATH}/tools/cmake/project.cmake) diff --git a/components/ulp/test_apps/lp_core/lp_core_basic_tests/CMakeLists.txt b/components/ulp/test_apps/lp_core/lp_core_basic_tests/CMakeLists.txt index 2881fcd2f4..bf96025abf 100644 --- a/components/ulp/test_apps/lp_core/lp_core_basic_tests/CMakeLists.txt +++ b/components/ulp/test_apps/lp_core/lp_core_basic_tests/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults") set(EXTRA_COMPONENT_DIRS - "$ENV{IDF_PATH}/tools/unit-test-app/components" + "$ENV{IDF_PATH}/tools/test_apps/components" ) # "Trim" the build. Include the minimal set of components, main, and anything it depends on. diff --git a/components/ulp/test_apps/lp_core/lp_core_hp_uart/CMakeLists.txt b/components/ulp/test_apps/lp_core/lp_core_hp_uart/CMakeLists.txt index 2c8bfb9861..ed55e4f694 100644 --- a/components/ulp/test_apps/lp_core/lp_core_hp_uart/CMakeLists.txt +++ b/components/ulp/test_apps/lp_core/lp_core_hp_uart/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults") set(EXTRA_COMPONENT_DIRS - "$ENV{IDF_PATH}/tools/unit-test-app/components" + "$ENV{IDF_PATH}/tools/test_apps/components" ) # "Trim" the build. Include the minimal set of components, main, and anything it depends on. diff --git a/components/ulp/test_apps/ulp_riscv/CMakeLists.txt b/components/ulp/test_apps/ulp_riscv/CMakeLists.txt index 7c6144aee8..3f033c94a7 100644 --- a/components/ulp/test_apps/ulp_riscv/CMakeLists.txt +++ b/components/ulp/test_apps/ulp_riscv/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults") set(EXTRA_COMPONENT_DIRS - "$ENV{IDF_PATH}/tools/unit-test-app/components" + "$ENV{IDF_PATH}/tools/test_apps/components" ) # "Trim" the build. Include the minimal set of components, main, and anything it depends on. diff --git a/components/vfs/test_apps/CMakeLists.txt b/components/vfs/test_apps/CMakeLists.txt index f7223c4d0f..3ce3715e86 100644 --- a/components/vfs/test_apps/CMakeLists.txt +++ b/components/vfs/test_apps/CMakeLists.txt @@ -1,7 +1,7 @@ # 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") +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults") diff --git a/components/wpa_supplicant/test_apps/main/idf_component.yml b/components/wpa_supplicant/test_apps/main/idf_component.yml index f5001494e2..d5f58e5fa9 100644 --- a/components/wpa_supplicant/test_apps/main/idf_component.yml +++ b/components/wpa_supplicant/test_apps/main/idf_component.yml @@ -1,3 +1,3 @@ dependencies: test_utils: - path: ${IDF_PATH}/tools/unit-test-app/components/test_utils + path: ${IDF_PATH}/tools/test_apps/components/test_utils diff --git a/tools/unit-test-app/components/test_utils/CMakeLists.txt b/tools/test_apps/components/test_utils/CMakeLists.txt similarity index 100% rename from tools/unit-test-app/components/test_utils/CMakeLists.txt rename to tools/test_apps/components/test_utils/CMakeLists.txt diff --git a/tools/unit-test-app/components/test_utils/Kconfig b/tools/test_apps/components/test_utils/Kconfig similarity index 100% rename from tools/unit-test-app/components/test_utils/Kconfig rename to tools/test_apps/components/test_utils/Kconfig diff --git a/tools/unit-test-app/components/test_utils/include/memory_checks.h b/tools/test_apps/components/test_utils/include/memory_checks.h similarity index 100% rename from tools/unit-test-app/components/test_utils/include/memory_checks.h rename to tools/test_apps/components/test_utils/include/memory_checks.h diff --git a/tools/unit-test-app/components/test_utils/include/test_utils.h b/tools/test_apps/components/test_utils/include/test_utils.h similarity index 100% rename from tools/unit-test-app/components/test_utils/include/test_utils.h rename to tools/test_apps/components/test_utils/include/test_utils.h diff --git a/tools/unit-test-app/components/test_utils/memory_checks.c b/tools/test_apps/components/test_utils/memory_checks.c similarity index 100% rename from tools/unit-test-app/components/test_utils/memory_checks.c rename to tools/test_apps/components/test_utils/memory_checks.c diff --git a/tools/unit-test-app/components/test_utils/ref_clock_impl_rmt_pcnt.c b/tools/test_apps/components/test_utils/ref_clock_impl_rmt_pcnt.c similarity index 100% rename from tools/unit-test-app/components/test_utils/ref_clock_impl_rmt_pcnt.c rename to tools/test_apps/components/test_utils/ref_clock_impl_rmt_pcnt.c diff --git a/tools/unit-test-app/components/test_utils/ref_clock_impl_timergroup.c b/tools/test_apps/components/test_utils/ref_clock_impl_timergroup.c similarity index 100% rename from tools/unit-test-app/components/test_utils/ref_clock_impl_timergroup.c rename to tools/test_apps/components/test_utils/ref_clock_impl_timergroup.c diff --git a/tools/unit-test-app/components/test_utils/test/CMakeLists.txt b/tools/test_apps/components/test_utils/test/CMakeLists.txt similarity index 100% rename from tools/unit-test-app/components/test_utils/test/CMakeLists.txt rename to tools/test_apps/components/test_utils/test/CMakeLists.txt diff --git a/tools/unit-test-app/components/test_utils/test/leak_test.c b/tools/test_apps/components/test_utils/test/leak_test.c similarity index 100% rename from tools/unit-test-app/components/test_utils/test/leak_test.c rename to tools/test_apps/components/test_utils/test/leak_test.c diff --git a/tools/unit-test-app/components/test_utils/test_runner.c b/tools/test_apps/components/test_utils/test_runner.c similarity index 100% rename from tools/unit-test-app/components/test_utils/test_runner.c rename to tools/test_apps/components/test_utils/test_runner.c diff --git a/tools/unit-test-app/components/test_utils/test_utils.c b/tools/test_apps/components/test_utils/test_utils.c similarity index 100% rename from tools/unit-test-app/components/test_utils/test_utils.c rename to tools/test_apps/components/test_utils/test_utils.c diff --git a/tools/test_apps/storage/sdmmc_console/CMakeLists.txt b/tools/test_apps/storage/sdmmc_console/CMakeLists.txt index caa12a6306..919538840c 100644 --- a/tools/test_apps/storage/sdmmc_console/CMakeLists.txt +++ b/tools/test_apps/storage/sdmmc_console/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.16) list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/examples/system/console/advanced/components") -list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components") list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/components/esp_driver_sdmmc/test_apps/sd_test_utils/components") list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests") list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/components/esp_driver_sdspi/test_apps/sdspi/components/sdspi_tests")