Merge branch 'refactor/optimize_test_app_builds' into 'master'

tools: setting components to main to reduce build time See merge request espressif/esp-idf!23253
2023-04-25 22:40:05 +08:00 · 2023-04-25 22:40:05 +08:00 · 98bf5a71c5
commit 98bf5a71c5
--- a/tools/test_apps/system/bootloader_sections/CMakeLists.txt
+++ b/tools/test_apps/system/bootloader_sections/CMakeLists.txt
@ -3,6 +3,7 @@
 cmake_minimum_required(VERSION 3.16)

 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(test_build)

 add_custom_target(check_bootloader_sections ALL
--- a/tools/test_apps/system/cxx_no_except/CMakeLists.txt
+++ b/tools/test_apps/system/cxx_no_except/CMakeLists.txt
@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.16)

 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(cxx_no_except)
--- a/tools/test_apps/system/cxx_pthread_bluetooth/CMakeLists.txt
+++ b/tools/test_apps/system/cxx_pthread_bluetooth/CMakeLists.txt
@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.16)

 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(cpp_pthread)
--- a/tools/test_apps/system/cxx_pthread_bluetooth/main/CMakeLists.txt
+++ b/tools/test_apps/system/cxx_pthread_bluetooth/main/CMakeLists.txt
@ -1,2 +1,3 @@
 idf_component_register(SRCS "cpp_pthread.cpp"
-                    INCLUDE_DIRS ".")
+                    INCLUDE_DIRS "."
+                    PRIV_REQUIRES pthread bt)
--- a/tools/test_apps/system/eh_frame/CMakeLists.txt
+++ b/tools/test_apps/system/eh_frame/CMakeLists.txt
@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.16)

 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(eh_frame)
--- a/tools/test_apps/system/gdb/CMakeLists.txt
+++ b/tools/test_apps/system/gdb/CMakeLists.txt
@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.16)

 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(gdb)
--- a/tools/test_apps/system/gdb_loadable_elf/CMakeLists.txt
+++ b/tools/test_apps/system/gdb_loadable_elf/CMakeLists.txt
@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.16)

 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(gdb_loadable_elf)
--- a/tools/test_apps/system/gdb_loadable_elf/main/CMakeLists.txt
+++ b/tools/test_apps/system/gdb_loadable_elf/main/CMakeLists.txt
@ -1,3 +1,4 @@
 idf_component_register(SRCS "hello_world_main.c"
-                    INCLUDE_DIRS "")
+                    INCLUDE_DIRS ""
+                    PRIV_REQUIRES vfs spi_flash)
 target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")
--- a/tools/test_apps/system/longjmp_test/CMakeLists.txt
+++ b/tools/test_apps/system/longjmp_test/CMakeLists.txt
@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.16)

 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(longjmp_test)
--- a/tools/test_apps/system/longjmp_test/main/CMakeLists.txt
+++ b/tools/test_apps/system/longjmp_test/main/CMakeLists.txt
@ -1,3 +1,4 @@
 idf_component_register(SRCS "hello_world_main.c"
-                    INCLUDE_DIRS "")
+                    INCLUDE_DIRS ""
+                    PRIV_REQUIRES esp_timer spi_flash)
 target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")
--- a/tools/test_apps/system/memprot/CMakeLists.txt
+++ b/tools/test_apps/system/memprot/CMakeLists.txt
@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.16)

 if((IDF_TARGET STREQUAL "esp32s2") OR (IDF_TARGET STREQUAL "esp32c3") OR (IDF_TARGET STREQUAL "esp32s3"))
    include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+    set(COMPONENTS main)
    project(test_memprot)

    target_link_libraries(${project_elf} PRIVATE
            "-Wl,--wrap=esp_panic_handler"
            "-Wl,--wrap=esp_panic_handler_reconfigure_wdts"
            "-Wl,--wrap=esp_cpu_stall")
-
 endif()
--- a/tools/test_apps/system/monitor_addr_lookup/CMakeLists.txt
+++ b/tools/test_apps/system/monitor_addr_lookup/CMakeLists.txt
@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.16)

 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(monitor_addr_lookup)
--- a/tools/test_apps/system/monitor_ide_integration/CMakeLists.txt
+++ b/tools/test_apps/system/monitor_ide_integration/CMakeLists.txt
@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.16)

 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main esp_gdbstub espcoredump)
 project(panic)
--- a/tools/test_apps/system/no_embedded_paths/CMakeLists.txt
+++ b/tools/test_apps/system/no_embedded_paths/CMakeLists.txt
@ -3,6 +3,7 @@
 cmake_minimum_required(VERSION 3.16)

 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(no_embedded_paths)

 idf_build_get_property(idf_path IDF_PATH)
--- a/tools/test_apps/system/no_embedded_paths/main/CMakeLists.txt
+++ b/tools/test_apps/system/no_embedded_paths/main/CMakeLists.txt
@ -1,2 +1,3 @@
 idf_component_register(SRCS "test_no_embedded_paths_main.c"
-                       INCLUDE_DIRS ".")
+                       INCLUDE_DIRS "."
+                       PRIV_REQUIRES bt)
--- a/tools/test_apps/system/panic/main/CMakeLists.txt
+++ b/tools/test_apps/system/panic/main/CMakeLists.txt
@ -13,4 +13,5 @@ endif()

 idf_component_register(SRCS "${srcs}"
                        INCLUDE_DIRS "include"
-                        REQUIRES spi_flash esp_psram esp_system esp_partition)
+                        REQUIRES spi_flash esp_psram esp_system esp_partition
+                        PRIV_REQUIRES esp_gdbstub)
--- a/tools/test_apps/system/ram_loadable_app/CMakeLists.txt
+++ b/tools/test_apps/system/ram_loadable_app/CMakeLists.txt
@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.16)

 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(ram_loadable_app)
--- a/tools/test_apps/system/ram_loadable_app/main/CMakeLists.txt
+++ b/tools/test_apps/system/ram_loadable_app/main/CMakeLists.txt
@ -1,2 +1,3 @@
 idf_component_register(SRCS "ram_loadable_app_test.c"
-                    INCLUDE_DIRS "")
+                    INCLUDE_DIRS ""
+                    PRIV_REQUIRES unity spi_flash)
--- a/tools/test_apps/system/ram_loadable_app/sdkconfig.defaults
+++ b/tools/test_apps/system/ram_loadable_app/sdkconfig.defaults
@ -1,8 +1,5 @@
 CONFIG_APP_BUILD_TYPE_RAM=y

-# Save size
-CONFIG_VFS_SUPPORT_IO=n
-
 # Reset is meaningless to ram_app
 CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y

--- a/tools/test_apps/system/ram_loadable_app/sdkconfig.defaults.esp32
+++ b/tools/test_apps/system/ram_loadable_app/sdkconfig.defaults.esp32
@ -1,8 +1,5 @@
 CONFIG_APP_BUILD_TYPE_RAM=y

-# Save size
-CONFIG_VFS_SUPPORT_TERMIOS=n
-
 # Reset is meaningless to ram_app
 CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y

--- a/tools/test_apps/system/startup/CMakeLists.txt
+++ b/tools/test_apps/system/startup/CMakeLists.txt
@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.16)

 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(test_startup)
--- a/tools/test_apps/system/startup/main/CMakeLists.txt
+++ b/tools/test_apps/system/startup/main/CMakeLists.txt
@ -1,5 +1,6 @@
 idf_component_register(SRCS "test_startup_main.c"
-                       INCLUDE_DIRS ".")
+                       INCLUDE_DIRS "."
+                       PRIV_REQUIRES vfs)

 if(CONFIG_SINGLE_CORE_VARIANT)
    target_sources(${COMPONENT_LIB} PRIVATE "${CMAKE_CURRENT_LIST_DIR}/chip_info_patch.c")
--- a/tools/test_apps/system/unicore_bootloader/CMakeLists.txt
+++ b/tools/test_apps/system/unicore_bootloader/CMakeLists.txt
@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.16)

 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(test_unicore_bootloader)