Skip to content

Commit 668ce92

Browse files
committed
Merge branch 'ci/test_apps_ulp_dep' into 'master'
ci(network): fixed dependencies for misc network and wifi related test apps Closes IDF-14193, IDF-14201, IDF-14205, IDF-14204, IDF-14192, and IDF-14196 See merge request espressif/esp-idf!42592
2 parents a1f765b + 4b2a8b9 commit 668ce92

File tree

10 files changed

+23
-4
lines changed

10 files changed

+23
-4
lines changed

components/esp_wifi/test_apps/wifi_connect/main/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ idf_component_register(SRCS
44
"test_bss_max_idle.c"
55

66
PRIV_INCLUDE_DIRS . ${CMAKE_CURRENT_BINARY_DIR}
7-
PRIV_REQUIRES cmock test_utils nvs_flash ulp esp_common esp_wifi esp_event
7+
PRIV_REQUIRES cmock test_utils nvs_flash esp_common esp_wifi esp_event
88
WHOLE_ARCHIVE)
99

1010
add_definitions(-DCONFIG_ESP_WIFI_BSS_MAX_IDLE_SUPPORT)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
idf_component_register(SRC_DIRS .
22
PRIV_INCLUDE_DIRS . ${CMAKE_CURRENT_BINARY_DIR}
3-
PRIV_REQUIRES cmock test_utils nvs_flash ulp esp_common esp_wifi esp_event
3+
PRIV_REQUIRES cmock test_utils nvs_flash esp_common esp_wifi esp_event
44
WHOLE_ARCHIVE)

tools/test_apps/phy/phy_tsens/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@ cmake_minimum_required(VERSION 3.22)
33

44
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
55

6+
# "Trim" the build. Include the minimal set of components, main, and anything it depends on.
7+
set(COMPONENTS main)
8+
69
project(phy_tsens)
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
idf_component_register(SRC_DIRS .)
1+
idf_component_register(SRC_DIRS .
2+
PRIV_REQUIRES console esp_wifi esp_driver_tsens nvs_flash esp_pm)

tools/test_apps/protocols/esp_netif/build_config/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@
33
cmake_minimum_required(VERSION 3.22)
44

55
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
6+
7+
# "Trim" the build. Include the minimal set of components, main, and anything it depends on.
8+
set(COMPONENTS main)
9+
610
project(esp_netif_build_config)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
idf_component_register(SRCS "netif_init_c99.c" "main.cpp" "netif_init_cpp.cpp"
2+
PRIV_REQUIRES nvs_flash esp_wifi wpa_supplicant
23
INCLUDE_DIRS ".")

tools/test_apps/protocols/mqtt/build_test/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,8 @@ cmake_minimum_required(VERSION 3.22)
77
set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common)
88

99
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
10+
11+
# "Trim" the build. Include the minimal set of components, main, and anything it depends on.
12+
set(COMPONENTS main)
13+
1014
project(mqtt_tcp)
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
idf_component_register(SRCS "mqtt_app.cpp"
2-
INCLUDE_DIRS ".")
2+
INCLUDE_DIRS "."
3+
PRIV_REQUIRES nvs_flash esp_event esp_netif mqtt)
34
target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")

tools/test_apps/protocols/network_tests/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@
33
cmake_minimum_required(VERSION 3.22)
44

55
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
6+
7+
# "Trim" the build. Include the minimal set of components, main, and anything it depends on.
8+
set(COMPONENTS main)
9+
610
project(net_suite)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
idf_component_register(SRCS "net_suite.c" "stdinout.c"
2+
PRIV_REQUIRES esp_event esp_netif vfs esp_driver_uart console
23
INCLUDE_DIRS ".")

0 commit comments

Comments
 (0)