CMake: Move nanostack libservice stubs to the connectivity/libraries dir

rajkan01 · rajkan01 · commit d95bf96bbf53 · 2021-07-13T05:49:53.000-07:00
Move the connectivity nanostack-libservice stubs into the connectivity/libraries
directory where the nanostack libservice component present as nanostack
libservice source copied from the external repo. So we can avoid duplicating
the mbed-os source tree in a central UNITTESTS folder.
diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt
@@ -48,13 +48,10 @@ target_include_directories(mbed-stubs-headers
         .
 )
 
-add_subdirectory(connectivity)
-
 add_library(mbed-stubs INTERFACE)
 
 target_link_libraries(mbed-stubs
     INTERFACE
-        mbed-stubs-connectivity
         mbed-stubs-drivers
         mbed-stubs-events
         mbed-stubs-hal
diff --git a/UNITTESTS/stubs/connectivity/CMakeLists.txt b/UNITTESTS/stubs/connectivity/CMakeLists.txt
diff --git a/connectivity/CMakeLists.txt b/connectivity/CMakeLists.txt
@@ -42,4 +42,5 @@ else()
     add_subdirectory(lorawan)
     add_subdirectory(netsocket)
     add_subdirectory(mbedtls)
+    add_subdirectory(libraries)
 endif()
diff --git a/connectivity/libraries/CMakeLists.txt b/connectivity/libraries/CMakeLists.txt
@@ -1,6 +1,10 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
+    add_subdirectory(tests/UNITTESTS)
+endif()
+
 add_subdirectory(mbed-coap)
 add_subdirectory(nanostack-libservice)
 add_subdirectory(ppp)
diff --git a/connectivity/libraries/tests/UNITTESTS/.mbedignore b/connectivity/libraries/tests/UNITTESTS/.mbedignore
@@ -0,0 +1 @@
+*
diff --git a/connectivity/libraries/tests/UNITTESTS/CMakeLists.txt b/connectivity/libraries/tests/UNITTESTS/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_subdirectory(doubles)
diff --git a/connectivity/libraries/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/libraries/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mbed-stubs-nanostack-libservice)
+
+target_sources(mbed-stubs-nanostack-libservice
+    PRIVATE
+        ip4tos_stub.c
+        stoip4_stub.c
+)
+
+target_link_libraries(mbed-stubs-nanostack-libservice
+    PRIVATE
+        mbed-stubs-rtos-headers
+        mbed-headers
+        mbed-stubs-headers
+        mbed-stubs-rtos
+        mbed-stubs-platform
+        gtest
+)
diff --git a/connectivity/libraries/tests/UNITTESTS/doubles/ip4tos_stub.c b/connectivity/libraries/tests/UNITTESTS/doubles/ip4tos_stub.c
diff --git a/connectivity/libraries/tests/UNITTESTS/doubles/stoip4_stub.c b/connectivity/libraries/tests/UNITTESTS/doubles/stoip4_stub.c

Original file line number	Diff line number	Diff line change
`@@ -48,13 +48,10 @@ target_include_directories(mbed-stubs-headers`
`48`	`48`	`.`
`49`	`49`	`)`
`50`	`50`
`51`		`-add_subdirectory(connectivity)`
`52`		`-`
`53`	`51`	`add_library(mbed-stubs INTERFACE)`
`54`	`52`
`55`	`53`	`target_link_libraries(mbed-stubs`
`56`	`54`	`INTERFACE`
`57`		`- mbed-stubs-connectivity`
`58`	`55`	`mbed-stubs-drivers`
`59`	`56`	`mbed-stubs-events`
`60`	`57`	`mbed-stubs-hal`