Merge pull request #14929 from LDong-Arm/move_target_h

Unit tests: Move target_h/ stubs into libraries' test doubles

Author: Patater

.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 ###

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

UNITTESTS/target_h/arm_math.h

@@ -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()

UNITTESTS/target_h/mbed.h

@@ -0,0 +1 @@
+*

UNITTESTS/target_h/nsapi_ppp.h

@@ -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
+        .
+)