From 4b2a8b946fd0eaa6bb4069e9e16eff161431aa41 Mon Sep 17 00:00:00 2001 From: Marius Vikhammer Date: Tue, 14 Oct 2025 19:35:16 +0800 Subject: [PATCH] ci(network): fixed dependencies for misc network and wifi related test apps --- .../esp_wifi/test_apps/wifi_connect/main/CMakeLists.txt | 2 +- .../esp_wifi/test_apps/wifi_function/main/CMakeLists.txt | 2 +- tools/test_apps/phy/phy_tsens/CMakeLists.txt | 3 +++ tools/test_apps/phy/phy_tsens/main/CMakeLists.txt | 3 ++- .../test_apps/protocols/esp_netif/build_config/CMakeLists.txt | 4 ++++ .../protocols/esp_netif/build_config/main/CMakeLists.txt | 1 + tools/test_apps/protocols/mqtt/build_test/CMakeLists.txt | 4 ++++ tools/test_apps/protocols/mqtt/build_test/main/CMakeLists.txt | 3 ++- tools/test_apps/protocols/network_tests/CMakeLists.txt | 4 ++++ tools/test_apps/protocols/network_tests/main/CMakeLists.txt | 1 + 10 files changed, 23 insertions(+), 4 deletions(-) diff --git a/components/esp_wifi/test_apps/wifi_connect/main/CMakeLists.txt b/components/esp_wifi/test_apps/wifi_connect/main/CMakeLists.txt index 89978ae9be..4123a65ebf 100644 --- a/components/esp_wifi/test_apps/wifi_connect/main/CMakeLists.txt +++ b/components/esp_wifi/test_apps/wifi_connect/main/CMakeLists.txt @@ -4,7 +4,7 @@ idf_component_register(SRCS "test_bss_max_idle.c" PRIV_INCLUDE_DIRS . ${CMAKE_CURRENT_BINARY_DIR} - PRIV_REQUIRES cmock test_utils nvs_flash ulp esp_common esp_wifi esp_event + PRIV_REQUIRES cmock test_utils nvs_flash esp_common esp_wifi esp_event WHOLE_ARCHIVE) add_definitions(-DCONFIG_ESP_WIFI_BSS_MAX_IDLE_SUPPORT) diff --git a/components/esp_wifi/test_apps/wifi_function/main/CMakeLists.txt b/components/esp_wifi/test_apps/wifi_function/main/CMakeLists.txt index f6569b52cb..7d2d12523c 100644 --- a/components/esp_wifi/test_apps/wifi_function/main/CMakeLists.txt +++ b/components/esp_wifi/test_apps/wifi_function/main/CMakeLists.txt @@ -1,4 +1,4 @@ idf_component_register(SRC_DIRS . PRIV_INCLUDE_DIRS . ${CMAKE_CURRENT_BINARY_DIR} - PRIV_REQUIRES cmock test_utils nvs_flash ulp esp_common esp_wifi esp_event + PRIV_REQUIRES cmock test_utils nvs_flash esp_common esp_wifi esp_event WHOLE_ARCHIVE) diff --git a/tools/test_apps/phy/phy_tsens/CMakeLists.txt b/tools/test_apps/phy/phy_tsens/CMakeLists.txt index 774b653d3e..7257588f0f 100644 --- a/tools/test_apps/phy/phy_tsens/CMakeLists.txt +++ b/tools/test_apps/phy/phy_tsens/CMakeLists.txt @@ -3,4 +3,7 @@ cmake_minimum_required(VERSION 3.22) include($ENV{IDF_PATH}/tools/cmake/project.cmake) +# "Trim" the build. Include the minimal set of components, main, and anything it depends on. +set(COMPONENTS main) + project(phy_tsens) diff --git a/tools/test_apps/phy/phy_tsens/main/CMakeLists.txt b/tools/test_apps/phy/phy_tsens/main/CMakeLists.txt index 72f7e58de9..517ca1d723 100644 --- a/tools/test_apps/phy/phy_tsens/main/CMakeLists.txt +++ b/tools/test_apps/phy/phy_tsens/main/CMakeLists.txt @@ -1 +1,2 @@ -idf_component_register(SRC_DIRS .) +idf_component_register(SRC_DIRS . + PRIV_REQUIRES console esp_wifi esp_driver_tsens nvs_flash esp_pm) diff --git a/tools/test_apps/protocols/esp_netif/build_config/CMakeLists.txt b/tools/test_apps/protocols/esp_netif/build_config/CMakeLists.txt index 8cbde63e60..db9bc357bd 100644 --- a/tools/test_apps/protocols/esp_netif/build_config/CMakeLists.txt +++ b/tools/test_apps/protocols/esp_netif/build_config/CMakeLists.txt @@ -3,4 +3,8 @@ cmake_minimum_required(VERSION 3.22) include($ENV{IDF_PATH}/tools/cmake/project.cmake) + +# "Trim" the build. Include the minimal set of components, main, and anything it depends on. +set(COMPONENTS main) + project(esp_netif_build_config) diff --git a/tools/test_apps/protocols/esp_netif/build_config/main/CMakeLists.txt b/tools/test_apps/protocols/esp_netif/build_config/main/CMakeLists.txt index cbe31657a6..8af845e650 100644 --- a/tools/test_apps/protocols/esp_netif/build_config/main/CMakeLists.txt +++ b/tools/test_apps/protocols/esp_netif/build_config/main/CMakeLists.txt @@ -1,2 +1,3 @@ idf_component_register(SRCS "netif_init_c99.c" "main.cpp" "netif_init_cpp.cpp" + PRIV_REQUIRES nvs_flash esp_wifi wpa_supplicant INCLUDE_DIRS ".") diff --git a/tools/test_apps/protocols/mqtt/build_test/CMakeLists.txt b/tools/test_apps/protocols/mqtt/build_test/CMakeLists.txt index a48b8b4edb..6481f74b8e 100644 --- a/tools/test_apps/protocols/mqtt/build_test/CMakeLists.txt +++ b/tools/test_apps/protocols/mqtt/build_test/CMakeLists.txt @@ -7,4 +7,8 @@ cmake_minimum_required(VERSION 3.22) set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) + +# "Trim" the build. Include the minimal set of components, main, and anything it depends on. +set(COMPONENTS main) + project(mqtt_tcp) diff --git a/tools/test_apps/protocols/mqtt/build_test/main/CMakeLists.txt b/tools/test_apps/protocols/mqtt/build_test/main/CMakeLists.txt index 2e8369cdcf..852d565585 100644 --- a/tools/test_apps/protocols/mqtt/build_test/main/CMakeLists.txt +++ b/tools/test_apps/protocols/mqtt/build_test/main/CMakeLists.txt @@ -1,3 +1,4 @@ idf_component_register(SRCS "mqtt_app.cpp" - INCLUDE_DIRS ".") + INCLUDE_DIRS "." + PRIV_REQUIRES nvs_flash esp_event esp_netif mqtt) target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format") diff --git a/tools/test_apps/protocols/network_tests/CMakeLists.txt b/tools/test_apps/protocols/network_tests/CMakeLists.txt index 3b77d68e8b..484a7b8d1b 100644 --- a/tools/test_apps/protocols/network_tests/CMakeLists.txt +++ b/tools/test_apps/protocols/network_tests/CMakeLists.txt @@ -3,4 +3,8 @@ cmake_minimum_required(VERSION 3.22) include($ENV{IDF_PATH}/tools/cmake/project.cmake) + +# "Trim" the build. Include the minimal set of components, main, and anything it depends on. +set(COMPONENTS main) + project(net_suite) diff --git a/tools/test_apps/protocols/network_tests/main/CMakeLists.txt b/tools/test_apps/protocols/network_tests/main/CMakeLists.txt index 2749edfb02..9b70114d40 100644 --- a/tools/test_apps/protocols/network_tests/main/CMakeLists.txt +++ b/tools/test_apps/protocols/network_tests/main/CMakeLists.txt @@ -1,2 +1,3 @@ idf_component_register(SRCS "net_suite.c" "stdinout.c" + PRIV_REQUIRES esp_event esp_netif vfs esp_driver_uart console INCLUDE_DIRS ".")