Refactor Unittest Stub library

Author: rajkan01

UNITTESTS/stubs/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 add_library(mbed-os-stubs-headers INTERFACE)
@@ -11,7 +11,7 @@ add_library(mbed-os-headers-drivers INTERFACE)
 add_library(mbed-os-headers-hal INTERFACE)
 add_library(mbed-os-headers-events INTERFACE)
 add_library(mbed-os-headers-rtos INTERFACE)
-add_library(mbed-os-stubs)
+
 
 target_link_libraries(mbed-os-headers
     INTERFACE
@@ -119,85 +119,6 @@ target_include_directories(mbed-os-stubs-headers
         ${MBED_PATH}/UNITTESTS/stubs
 )
 
-target_sources(mbed-os-stubs
-    PUBLIC
-        #${MBED_PATH}/UNITTESTS/stubs/aes_stub.c
-        #${MBED_PATH}/UNITTESTS/stubs/AT_CellularContext_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/AT_CellularDevice_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/AT_CellularInformation_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/AT_CellularNetwork_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/AT_CellularSMS_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/AT_CellularStack_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/AT_ControlPlane_netif_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/ATHandler_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/BufferedBlockDevice_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/BufferedSerial_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/CellularContext_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/CellularDevice_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/CellularInterface_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/CellularStateMachine_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/CellularUtil_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/ChainingBlockDevice_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/cipher_stub.c
-        #${MBED_PATH}/UNITTESTS/stubs/cmac_stub.c
-        #${MBED_PATH}/UNITTESTS/stubs/ConditionVariable_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/EmulatedSD.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/equeue_stub.c
-        #${MBED_PATH}/UNITTESTS/stubs/EventFlags_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/EventQueue_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/ExhaustibleBlockDevice_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/FileHandle_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/FlashSimBlockDevice_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/HeapBlockDevice_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/ip4tos_stub.c
-        #${MBED_PATH}/UNITTESTS/stubs/Kernel_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/kv_config_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/LoRaMacChannelPlan_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/LoRaMacCommand_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/LoRaMacCrypto_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/LoRaMac_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/LoRaPHYEU868_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/LoRaPHY_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/LoRaWANStack_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/LoRaWANTimer_stub.cpp
-        ${MBED_PATH}/UNITTESTS/stubs/mbed_assert_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/mbed_atomic_stub.c
-        ${MBED_PATH}/UNITTESTS/stubs/mbed_critical_stub.c
-        #${MBED_PATH}/UNITTESTS/stubs/mbed_error.c
-        #${MBED_PATH}/UNITTESTS/stubs/mbed_poll_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/mbed_retarget_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/mbed_rtos_rtx_stub.c
-        #${MBED_PATH}/UNITTESTS/stubs/mbed_shared_queues_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/mbed_wait_api_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/MBRBlockDevice_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/MeshInterface_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/Mutex_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/NetworkInterfaceDefaults_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/NetworkInterface_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/NetworkStack_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/nsapi_dns_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/nvic_wrapper_stub.c
-        #${MBED_PATH}/UNITTESTS/stubs/ObservingBlockDevice_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/ProfilingBlockDevice_stub.cpp
-        ${MBED_PATH}/UNITTESTS/stubs/pwmout_api_stub.c
-        #${MBED_PATH}/UNITTESTS/stubs/randLIB_stub.c
-        #${MBED_PATH}/UNITTESTS/stubs/randLIB_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/ReadOnlyBlockDevice_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/rtx_mutex_stub.c
-        #${MBED_PATH}/UNITTESTS/stubs/Semaphore_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/SerialBase_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/SlicingBlockDevice_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/SocketAddress_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/SocketStats_Stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/stoip4_stub.c
-        #${MBED_PATH}/UNITTESTS/stubs/ThisThread_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/Thread_stub.cpp
-        #${MBED_PATH}/UNITTESTS/stubs/us_ticker_stub.cpp
-        ${MBED_PATH}/UNITTESTS/stubs/watchdog_api_stub.c
-)
+add_subdirectory(${MBED_PATH}/UNITTESTS/stubs/platform)
+add_subdirectory(${MBED_PATH}/UNITTESTS/stubs/hal)
 
-target_link_libraries(mbed-os-stubs
-    PRIVATE
-        mbed-os-stubs-headers
-        mbed-os-headers
-)

UNITTESTS/stubs/hal/CMakeLists.txt

@@ -0,0 +1,15 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mbed-os-stubs-hal)
+
+target_sources(mbed-os-stubs-hal
+    PUBLIC
+        pwmout_api_stub.c
+        watchdog_api_stub.c
+)
+
+target_link_libraries(mbed-os-stubs-hal
+    PRIVATE
+        mbed-os-headers
+)

UNITTESTS/stubs/pwmout_api_stub.c renamed to UNITTESTS/stubs/hal/pwmout_api_stub.c

@@ -0,0 +1,25 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mbed-os-stubs-platform)
+
+target_include_directories(mbed-os-stubs-platform
+    PRIVATE
+        .
+)
+
+target_sources(mbed-os-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
+)
+
+target_link_libraries(mbed-os-stubs-platform
+    PRIVATE
+        mbed-os-headers
+)