Set up link order correctly (I hope)

multiplemonomials · multiplemonomials · commit 272a06f57377 · 2025-01-27T23:54:15.000-08:00
diff --git a/connectivity/netsocket/tests/TESTS/CMakeLists.txt b/connectivity/netsocket/tests/TESTS/CMakeLists.txt
@@ -12,5 +12,37 @@ if("TARGET_STM32H7" IN_LIST MBED_TARGET_DEFINITIONS)
 endif()
 
 add_subdirectory(common)
+
+# List of libraries for all netsocket tests to link.
+# We have to be a bit careful here, because, in order to build tests with both lwip and nanostack, we have
+# configured neither of the network stacks to provide the default implementation.
+# Instead, the defaults are contained in the mbed-netsocket-tests-use-xxx libraries under common.
+# Where we need to be careful is, any .a files that call OnboardNetworkStack::get_default_instance() need
+# to appear BEFORE mbed-netsocket-tests-use-xxx on the link line, or you will get an undefined reference
+# error. In CMake, there's no way to specify this kind of dependency except in the link line to the final
+# executable. This means we need to list them out explicitly here.
+set(MBED_NETSOCKET_TEST_COMMON_LIBS
+    mbed-netsocket-tests-common-inc)
+
+# Pull in cellular if cellular is the default network interface (used by NetworkInterfaceDefaults.cpp)
+if("MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE=CELLULAR" IN_LIST MBED_CONFIG_DEFINITIONS)
+    list(APPEND MBED_NETSOCKET_TEST_COMMON_LIBS mbed-cellular)
+endif()
+
+# Similarly if mesh networking is used bring in that library
+if("MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE=MESH" IN_LIST MBED_CONFIG_DEFINITIONS)
+    list(APPEND MBED_NETSOCKET_TEST_COMMON_LIBS mbed-nanostack-mbed_mesh_api)
+endif()
+
+# Similarly if wifi networking is used bring in that library
+if("MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE=WIFI" IN_LIST MBED_CONFIG_DEFINITIONS)
+    list(APPEND MBED_NETSOCKET_TEST_COMMON_LIBS mbed-wifi)
+endif()
+
+list(APPEND MBED_NETSOCKET_TEST_COMMON_LIBS mbed-netsocket-api)
+
+set(MBED_NETSOCKET_TEST_COMMON_LIBS_LWIPSTACK ${MBED_NETSOCKET_TEST_COMMON_LIBS} mbed-netsocket-tests-use-lwipstack)
+set(MBED_NETSOCKET_TEST_COMMON_LIBS_NANOSTACK ${MBED_NETSOCKET_TEST_COMMON_LIBS} mbed-netsocket-tests-use-nanostack)
+
 add_subdirectory(netsocket)
 add_subdirectory(network)
diff --git a/connectivity/netsocket/tests/TESTS/netsocket/dns/CMakeLists.txt b/connectivity/netsocket/tests/TESTS/netsocket/dns/CMakeLists.txt
@@ -33,9 +33,7 @@ mbed_greentea_add_test(
     TEST_SOURCES
         ${TEST_SOURCE_LIST}
     TEST_REQUIRED_LIBS
-        mbed-netsocket-tests-common-inc
-        mbed-netsocket-api
-        mbed-netsocket-tests-use-lwipstack
+        ${MBED_NETSOCKET_TEST_COMMON_LIBS_LWIPSTACK}
     TEST_SKIPPED
         ${TEST_SKIPPED}
 )
@@ -46,9 +44,7 @@ mbed_greentea_add_test(
     TEST_SOURCES
         ${TEST_SOURCE_LIST}
     TEST_REQUIRED_LIBS
-        mbed-netsocket-tests-common-inc
-        mbed-netsocket-api
-        mbed-netsocket-tests-use-nanostack
+        ${MBED_NETSOCKET_TEST_COMMON_LIBS_NANOSTACK}
     TEST_SKIPPED
         ${TEST_SKIPPED}
 )
diff --git a/connectivity/netsocket/tests/TESTS/netsocket/tcp/CMakeLists.txt b/connectivity/netsocket/tests/TESTS/netsocket/tcp/CMakeLists.txt
@@ -37,9 +37,7 @@ mbed_greentea_add_test(
     TEST_SOURCES
         ${TEST_SOURCE_LIST}
     TEST_REQUIRED_LIBS
-        mbed-netsocket-tests-common-inc
-        mbed-netsocket-api
-        mbed-netsocket-tests-use-lwipstack
+        ${MBED_NETSOCKET_TEST_COMMON_LIBS_LWIPSTACK}
     TEST_SKIPPED
         ${TEST_SKIPPED}
 )
@@ -50,9 +48,7 @@ mbed_greentea_add_test(
     TEST_SOURCES
         ${TEST_SOURCE_LIST}
     TEST_REQUIRED_LIBS
-        mbed-netsocket-tests-common-inc
-        mbed-netsocket-api
-        mbed-netsocket-tests-use-nanostack
+        ${MBED_NETSOCKET_TEST_COMMON_LIBS_NANOSTACK}
     TEST_SKIPPED
         ${TEST_SKIPPED}
 )
diff --git a/connectivity/netsocket/tests/TESTS/netsocket/tls/CMakeLists.txt b/connectivity/netsocket/tests/TESTS/netsocket/tls/CMakeLists.txt
@@ -37,11 +37,9 @@ mbed_greentea_add_test(
     TEST_SOURCES
         ${TEST_SOURCE_LIST}
     TEST_REQUIRED_LIBS
-        mbed-netsocket-tests-common-inc
         mbed-storage-blockdevice
         mbed-storage-littlefs
-        mbed-netsocket-api
-        mbed-netsocket-tests-use-lwipstack
+        ${MBED_NETSOCKET_TEST_COMMON_LIBS_LWIPSTACK}
     TEST_SKIPPED
         ${TEST_SKIPPED}
 )
@@ -52,11 +50,9 @@ mbed_greentea_add_test(
     TEST_SOURCES
         ${TEST_SOURCE_LIST}
     TEST_REQUIRED_LIBS
-        mbed-netsocket-tests-common-inc
         mbed-storage-blockdevice
         mbed-storage-littlefs
-        mbed-netsocket-api
-        mbed-netsocket-tests-use-nanostack
+        ${MBED_NETSOCKET_TEST_COMMON_LIBS_NANOSTACK}
     TEST_SKIPPED
         ${TEST_SKIPPED}
 )
diff --git a/connectivity/netsocket/tests/TESTS/netsocket/udp/CMakeLists.txt b/connectivity/netsocket/tests/TESTS/netsocket/udp/CMakeLists.txt
@@ -33,9 +33,7 @@ mbed_greentea_add_test(
     TEST_SOURCES
         ${TEST_SOURCE_LIST}
     TEST_REQUIRED_LIBS
-        mbed-netsocket-tests-common-inc
-        mbed-netsocket-api
-        mbed-netsocket-tests-use-lwipstack
+        ${MBED_NETSOCKET_TEST_COMMON_LIBS_LWIPSTACK}
     TEST_SKIPPED
         ${TEST_SKIPPED}
 )
@@ -46,9 +44,7 @@ mbed_greentea_add_test(
     TEST_SOURCES
         ${TEST_SOURCE_LIST}
     TEST_REQUIRED_LIBS
-        mbed-netsocket-tests-common-inc
-        mbed-netsocket-api
-        mbed-netsocket-tests-use-nanostack
+        ${MBED_NETSOCKET_TEST_COMMON_LIBS_NANOSTACK}
     TEST_SKIPPED
         ${TEST_SKIPPED}
-)
+)
diff --git a/connectivity/netsocket/tests/TESTS/network/emac/CMakeLists.txt b/connectivity/netsocket/tests/TESTS/network/emac/CMakeLists.txt
@@ -26,9 +26,8 @@ mbed_greentea_add_test(
     TEST_SOURCES
         ${TEST_SOURCE_LIST}
     TEST_REQUIRED_LIBS
-		mbed-netsocket
         mbed-emac-test-utils
-		mbed-netsocket-tests-common-inc
+		${MBED_NETSOCKET_TEST_COMMON_LIBS} # We don't want LwIP or nanostack
     TEST_SKIPPED
         ${TEST_SKIPPED}
 )
diff --git a/connectivity/netsocket/tests/TESTS/network/interface/CMakeLists.txt b/connectivity/netsocket/tests/TESTS/network/interface/CMakeLists.txt
@@ -19,10 +19,7 @@ mbed_greentea_add_test(
     TEST_SOURCES
         ${TEST_SOURCE_LIST}
     TEST_REQUIRED_LIBS
-        mbed-netsocket
-        mbed-netsocket-tests-common-inc
-        mbed-netsocket-api
-        mbed-netsocket-tests-use-lwipstack
+        ${MBED_NETSOCKET_TEST_COMMON_LIBS_LWIPSTACK}
     TEST_SKIPPED
         ${TEST_SKIPPED}
 )
@@ -33,10 +30,7 @@ mbed_greentea_add_test(
     TEST_SOURCES
         ${TEST_SOURCE_LIST}
     TEST_REQUIRED_LIBS
-        mbed-netsocket
-        mbed-netsocket-tests-common-inc
-        mbed-netsocket-api
-        mbed-netsocket-tests-use-nanostack
+        ${MBED_NETSOCKET_TEST_COMMON_LIBS_NANOSTACK}
     TEST_SKIPPED
         ${TEST_SKIPPED}
 )
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/CMakeLists.txt b/connectivity/netsocket/tests/TESTS/network/wifi/CMakeLists.txt
@@ -39,9 +39,7 @@ mbed_greentea_add_test(
     TEST_SOURCES
         ${TEST_SOURCE_LIST}
     TEST_REQUIRED_LIBS
-		mbed-netsocket-tests-common-inc
-		mbed-netsocket-api
-		mbed-netsocket-tests-use-lwipstack
+		${MBED_NETSOCKET_TEST_COMMON_LIBS_LWIPSTACK}
     TEST_SKIPPED
         ${TEST_SKIPPED}
 )
@@ -52,9 +50,7 @@ mbed_greentea_add_test(
 	TEST_SOURCES
 		${TEST_SOURCE_LIST}
 	TEST_REQUIRED_LIBS
-		mbed-netsocket-tests-common-inc
-		mbed-netsocket-api
-		mbed-netsocket-tests-use-nanostack
+		${MBED_NETSOCKET_TEST_COMMON_LIBS_NANOSTACK}
 	TEST_SKIPPED
 		${TEST_SKIPPED}
 )
