Merge pull request #14773 from rwalton-arm/move_platform_stub

Move mbed-stubs-platform to the platform directory

UNITTESTS/stubs/CMakeLists.txt

@@ -4,7 +4,6 @@
 add_library(mbed-stubs-headers INTERFACE)
 add_library(mbed-headers INTERFACE)
 add_library(mbed-headers-base INTERFACE)
-add_library(mbed-headers-platform INTERFACE)
 add_library(mbed-headers-connectivity INTERFACE)
 add_library(mbed-headers-events INTERFACE)
 
@@ -19,15 +18,6 @@ target_link_libraries(mbed-headers
         mbed-headers-rtos
 )
 
-target_include_directories(mbed-headers-platform
-    INTERFACE
-        ${mbed-os_SOURCE_DIR}/platform/include
-        ${mbed-os_SOURCE_DIR}/platform/include/platform
-        ${mbed-os_SOURCE_DIR}/platform/randlib/include/mbed-client-randlib/
-        ${mbed-os_SOURCE_DIR}/platform/randlib/include/
-        ${mbed-os_SOURCE_DIR}/platform/mbed-trace/include
-)
-
 target_include_directories(mbed-headers-base
     INTERFACE
         ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h
@@ -74,7 +64,6 @@ target_include_directories(mbed-stubs-headers
 
 add_subdirectory(connectivity)
 add_subdirectory(events)
-add_subdirectory(platform)
 
 add_library(mbed-stubs INTERFACE)
 

UNITTESTS/stubs/connectivity/CMakeLists.txt

@@ -40,5 +40,6 @@ target_link_libraries(mbed-stubs-connectivity
         mbed-headers
         mbed-stubs-headers
         mbed-stubs-rtos
+        mbed-stubs-platform
         gtest
 )

UNITTESTS/stubs/platform/CMakeLists.txt

@@ -1,30 +0,0 @@
-# Copyright (c) 2021 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(mbed-stubs-platform)
-
-target_sources(mbed-stubs-platform
-    PRIVATE
-        mbed_critical_stub.c
-        mbed_atomic_stub.c
-        mbed_error.c
-        mbed_poll_stub.cpp
-        mbed_assert_stub.cpp
-        mbed_wait_api_stub.cpp
-        mbed_retarget_stub.cpp
-        FileHandle_stub.cpp
-        nvic_wrapper_stub.c
-        randLIB_stub.c
-        randLIB_stub.cpp
-)
-
-target_link_options(mbed-stubs-platform
-    PRIVATE
-        --coverage
-)
-
-target_link_libraries(mbed-stubs-platform
-    PRIVATE
-        mbed-headers
-        mbed-stubs-headers
-)

connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt

@@ -51,7 +51,7 @@ target_link_libraries(mbed-stubs-cellular
     PRIVATE
         mbed-headers-base
         mbed-headers-connectivity
-        mbed-headers-platform
+        mbed-stubs-platform
         mbed-headers-rtos
         mbed-headers-drivers
         mbed-headers-hal

platform/tests/UNITTESTS/ATCmdParser/CMakeLists.txt

@@ -13,8 +13,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers
-        mbed-stubs-headers
         mbed-stubs-platform
         gmock_main
 )

platform/tests/UNITTESTS/CMakeLists.txt

@@ -1,5 +1,6 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+add_subdirectory(doubles)
 add_subdirectory(ATCmdParser)
 add_subdirectory(CircularBuffer)

platform/tests/UNITTESTS/CircularBuffer/CMakeLists.txt

@@ -12,7 +12,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers        
         mbed-stubs-platform
         gmock_main
 )

platform/tests/UNITTESTS/doubles/CMakeLists.txt

@@ -0,0 +1,38 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mbed-headers-platform INTERFACE)
+target_include_directories(mbed-headers-platform
+    INTERFACE
+        ${mbed-os_SOURCE_DIR}/platform/include
+        ${mbed-os_SOURCE_DIR}/platform/include/platform
+        ${mbed-os_SOURCE_DIR}/platform/randlib/include/mbed-client-randlib/
+        ${mbed-os_SOURCE_DIR}/platform/randlib/include/
+        ${mbed-os_SOURCE_DIR}/platform/mbed-trace/include
+)
+
+add_library(mbed-stubs-platform)
+target_sources(mbed-stubs-platform
+    PRIVATE
+        mbed_critical_stub.c
+        mbed_atomic_stub.c
+        mbed_error.c
+        mbed_poll_stub.cpp
+        mbed_assert_stub.cpp
+        mbed_wait_api_stub.cpp
+        mbed_retarget_stub.cpp
+        FileHandle_stub.cpp
+        nvic_wrapper_stub.c
+        randLIB_stub.c
+        randLIB_stub.cpp
+)
+target_include_directories(mbed-stubs-platform
+    PUBLIC
+        .
+)
+target_link_libraries(mbed-stubs-platform
+    PUBLIC
+        mbed-headers-base
+        mbed-headers-hal
+        mbed-headers-platform
+)