Merge pull request #14929 from LDong-Arm/move_target_h

Unit tests: Move target_h/ stubs into libraries' test doubles
ARMmbed · Aug 3, 2021 · 7acd5b4 · 7acd5b4
2 parents 7214fe9 + 81eb6cb
commit 7acd5b4
Show file tree

Hide file tree

Showing 104 changed files with 72 additions and 171 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -244,7 +244,7 @@ matrix:
         - >-
           git diff --name-only --diff-filter=d FETCH_HEAD..HEAD \
             | ( grep '.*[\\|\/]PinNames.h$' || true ) \
-            | while read file; do python ./hal/tests/pinvalidate/pinvalidate.py -vfp "${file}"; done
+            | while read file; do python ./hal/tests/pinvalidate/pinvalidate.py -vvvfp "${file}"; done
         - git diff --exit-code --diff-filter=d --color
 
     ### CMake Check ###

diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt
@@ -3,30 +3,16 @@
 
 add_library(mbed-stubs-headers INTERFACE)
 add_library(mbed-headers INTERFACE)
-add_library(mbed-headers-base INTERFACE)
 
 target_link_libraries(mbed-headers
     INTERFACE
-        mbed-headers-base
         mbed-headers-platform
         mbed-headers-drivers
         mbed-headers-hal
         mbed-headers-events
         mbed-headers-rtos
 )
 
-target_include_directories(mbed-headers-base
-    INTERFACE
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/platform
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/platform/cxxsupport
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/drivers
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/rtos/include
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/rtos
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/sys
-)
-
-
 target_include_directories(mbed-headers
     INTERFACE
         ${mbed-os_SOURCE_DIR}/features

diff --git a/UNITTESTS/target_h/arm_math.h b/UNITTESTS/target_h/arm_math.h
diff --git a/UNITTESTS/target_h/mbed.h b/UNITTESTS/target_h/mbed.h
diff --git a/UNITTESTS/target_h/nsapi_ppp.h b/UNITTESTS/target_h/nsapi_ppp.h
diff --git a/UNITTESTS/target_h/sys/syslimits.h b/UNITTESTS/target_h/sys/syslimits.h
diff --git a/cmsis/CMakeLists.txt b/cmsis/CMakeLists.txt
@@ -4,3 +4,6 @@
 add_subdirectory(CMSIS_5)
 add_subdirectory(device)
 
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
+    add_subdirectory(tests/UNITTESTS/doubles)
+endif()
diff --git a/cmsis/tests/UNITTESTS/.mbedignore b/cmsis/tests/UNITTESTS/.mbedignore
@@ -0,0 +1 @@
+*
diff --git a/cmsis/tests/UNITTESTS/doubles/CMakeLists.txt b/cmsis/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright (c) 2021 Arm Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mbed-headers-cmsis INTERFACE)
+
+target_include_directories(mbed-headers-cmsis
+    INTERFACE
+        .
+)
diff --git a/UNITTESTS/target_h/cmsis.h → cmsis/tests/UNITTESTS/doubles/cmsis.h b/UNITTESTS/target_h/cmsis.h → cmsis/tests/UNITTESTS/doubles/cmsis.h
diff --git a/UNITTESTS/target_h/cmsis_compiler.h → .../tests/UNITTESTS/doubles/cmsis_compiler.h b/UNITTESTS/target_h/cmsis_compiler.h → .../tests/UNITTESTS/doubles/cmsis_compiler.h
diff --git a/UNITTESTS/target_h/cmsis_os.h → cmsis/tests/UNITTESTS/doubles/cmsis_os.h b/UNITTESTS/target_h/cmsis_os.h → cmsis/tests/UNITTESTS/doubles/cmsis_os.h
diff --git a/UNITTESTS/target_h/cmsis_os2.h → cmsis/tests/UNITTESTS/doubles/cmsis_os2.h b/UNITTESTS/target_h/cmsis_os2.h → cmsis/tests/UNITTESTS/doubles/cmsis_os2.h
diff --git a/UNITTESTS/target_h/mbed_rtx.h → cmsis/tests/UNITTESTS/doubles/mbed_rtx.h b/UNITTESTS/target_h/mbed_rtx.h → cmsis/tests/UNITTESTS/doubles/mbed_rtx.h
diff --git a/UNITTESTS/target_h/mbed_rtx_conf.h → ...s/tests/UNITTESTS/doubles/mbed_rtx_conf.h b/UNITTESTS/target_h/mbed_rtx_conf.h → ...s/tests/UNITTESTS/doubles/mbed_rtx_conf.h
diff --git a/UNITTESTS/target_h/rtx_lib.h → cmsis/tests/UNITTESTS/doubles/rtx_lib.h b/UNITTESTS/target_h/rtx_lib.h → cmsis/tests/UNITTESTS/doubles/rtx_lib.h
diff --git a/UNITTESTS/target_h/rtx_os.h → cmsis/tests/UNITTESTS/doubles/rtx_os.h b/UNITTESTS/target_h/rtx_os.h → cmsis/tests/UNITTESTS/doubles/rtx_os.h
diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -49,7 +49,6 @@ target_sources(mbed-stubs-cellular
 
 target_link_libraries(mbed-stubs-cellular
     PRIVATE
-        mbed-headers-base
         mbed-stubs-platform
         mbed-headers-rtos
         mbed-headers-drivers

diff --git a/UNITTESTS/target_h/myCellularContext.h → ...sts/UNITTESTS/doubles/myCellularContext.h b/UNITTESTS/target_h/myCellularContext.h → ...sts/UNITTESTS/doubles/myCellularContext.h
@@ -137,7 +137,8 @@ class myCellularContext : public CellularContext {
         return true;
     };
 
-    const char* get_nonip_context_type_str() {
+    const char *get_nonip_context_type_str()
+    {
         return "Non-IP";
     }
 

diff --git a/UNITTESTS/target_h/myCellularDevice.h → ...ests/UNITTESTS/doubles/myCellularDevice.h b/UNITTESTS/target_h/myCellularDevice.h → ...ests/UNITTESTS/doubles/myCellularDevice.h
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt
@@ -23,7 +23,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-platform
         mbed-headers-events
         mbed-headers-rtos

diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt
@@ -29,7 +29,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-platform
         mbed-headers-events
         mbed-headers-rtos

diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt
@@ -21,7 +21,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-platform
         mbed-headers-events
         mbed-headers-rtos

diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt
@@ -22,7 +22,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-platform
         mbed-headers-events
         mbed-headers-rtos

diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt
@@ -22,7 +22,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-platform
         mbed-headers-events
         mbed-headers-rtos

diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt
@@ -27,7 +27,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-platform
         mbed-headers-events
         mbed-headers-rtos

diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt
@@ -26,7 +26,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-platform
         mbed-headers-events
         mbed-headers-rtos

diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
@@ -31,7 +31,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-platform
         mbed-headers-events
         mbed-headers-rtos

diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt
@@ -29,7 +29,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-platform
         mbed-headers-events
         mbed-headers-rtos

diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
@@ -30,7 +30,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-platform
         mbed-headers-events
         mbed-headers-rtos

diff --git a/connectivity/lorawan/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -40,7 +40,6 @@ target_sources(mbed-stubs-lorawan
 
 target_link_libraries(mbed-stubs-lorawan
     PRIVATE
-        mbed-headers-base
         mbed-headers-events
         mbed-headers-hal
         mbed-stubs-headers

diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/CMakeLists.txt
@@ -35,7 +35,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-events
         mbed-headers-hal
         mbed-headers-platform

diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/CMakeLists.txt
@@ -20,7 +20,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-events
         mbed-headers-hal
         mbed-headers-platform

diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/CMakeLists.txt
@@ -20,7 +20,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-events
         mbed-headers-hal
         mbed-headers-platform

diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/CMakeLists.txt
@@ -20,7 +20,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-platform
         mbed-headers-mbedtls
         mbed-headers-lorawan

diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/CMakeLists.txt
@@ -24,7 +24,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-events
         mbed-headers-hal
         mbed-headers-platform

diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/CMakeLists.txt
@@ -22,7 +22,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-events
         mbed-headers-hal
         mbed-headers-platform

diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/CMakeLists.txt
@@ -28,7 +28,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-events
         mbed-headers-hal
         mbed-headers-platform

diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/CMakeLists.txt
@@ -28,7 +28,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-events
         mbed-headers-hal
         mbed-headers-platform

diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/CMakeLists.txt
@@ -22,7 +22,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-events
         mbed-headers-hal
         mbed-headers-platform

diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/CMakeLists.txt
@@ -22,7 +22,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-events
         mbed-headers-hal
         mbed-headers-platform

diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/CMakeLists.txt
@@ -22,7 +22,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-events
         mbed-headers-hal
         mbed-headers-platform

diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyin865/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyin865/CMakeLists.txt
@@ -22,7 +22,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-events
         mbed-headers-hal
         mbed-headers-platform

diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/CMakeLists.txt
@@ -22,7 +22,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-events
         mbed-headers-hal
         mbed-headers-platform

diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/CMakeLists.txt
@@ -28,7 +28,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-events
         mbed-headers-hal
         mbed-headers-platform

diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/CMakeLists.txt
@@ -21,7 +21,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-events
         mbed-headers-hal
         mbed-headers-platform

diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/CMakeLists.txt
@@ -22,7 +22,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-events
         mbed-headers-hal
         mbed-headers-platform

diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawantimer/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawantimer/CMakeLists.txt
@@ -21,7 +21,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-events
         mbed-headers-platform
         mbed-headers-lorawan

diff --git a/connectivity/netsocket/tests/UNITTESTS/doubles/NetworkStack_stub.cpp b/connectivity/netsocket/tests/UNITTESTS/doubles/NetworkStack_stub.cpp
@@ -17,7 +17,6 @@
 
 #include "netsocket/NetworkStack.h"
 #include "netsocket/nsapi_dns.h"
-#include "mbed.h"
 #include "stddef.h"
 #include <new>