Merge pull request #14827 from ARMmbed/move_hal_stubs

Move hal stubs to hal directory
ARMmbed · Jul 1, 2021 · d0c4468 · d0c4468
2 parents b5c2f70 + 26c608b
commit d0c4468
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 14 deletions.
diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(mbed-headers-base INTERFACE)
 add_library(mbed-headers-platform INTERFACE)
 add_library(mbed-headers-connectivity INTERFACE)
 add_library(mbed-headers-storage INTERFACE)
-add_library(mbed-headers-hal INTERFACE)
 add_library(mbed-headers-events INTERFACE)
 
 target_link_libraries(mbed-headers
@@ -89,12 +88,6 @@ target_include_directories(mbed-headers-events
         ${mbed-os_SOURCE_DIR}/events/include/events/internal
 )
 
-target_include_directories(mbed-headers-hal
-    INTERFACE
-        ${mbed-os_SOURCE_DIR}/hal
-        ${mbed-os_SOURCE_DIR}/hal/include
-)
-
 target_include_directories(mbed-headers
     INTERFACE
         ${mbed-os_SOURCE_DIR}/features
@@ -109,7 +102,6 @@ target_include_directories(mbed-stubs-headers
 
 add_subdirectory(connectivity)
 add_subdirectory(events)
-add_subdirectory(hal)
 add_subdirectory(platform)
 add_subdirectory(storage)
 

diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt
@@ -1,6 +1,10 @@
 # Copyright (c) 2020-2021 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(TARGET_FLASH_CMSIS_ALGO EXCLUDE_FROM_ALL)
 
 add_subdirectory(usb)

diff --git a/hal/tests/.mbedignore b/hal/tests/.mbedignore
@@ -0,0 +1 @@
+UNITTESTS/*
diff --git a/hal/tests/UNITTESTS/CMakeLists.txt b/hal/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/UNITTESTS/stubs/hal/CMakeLists.txt → hal/tests/UNITTESTS/doubles/CMakeLists.txt b/UNITTESTS/stubs/hal/CMakeLists.txt → hal/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -1,6 +1,14 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+add_library(mbed-headers-hal INTERFACE)
+
+target_include_directories(mbed-headers-hal
+    INTERFACE
+        ${mbed-os_SOURCE_DIR}/hal
+        ${mbed-os_SOURCE_DIR}/hal/include
+)
+
 add_library(mbed-stubs-hal)
 
 target_compile_definitions(mbed-stubs-hal
@@ -17,13 +25,10 @@ target_sources(mbed-stubs-hal
         watchdog_api_stub.c
 )
 
-target_link_options(mbed-stubs-hal
-    PRIVATE
-        --coverage
-)
-
 target_link_libraries(mbed-stubs-hal
     PRIVATE
-        mbed-headers
+        mbed-headers-base
+        mbed-headers-hal
+        mbed-headers-platform
         mbed-stubs-headers
 )
diff --git a/UNITTESTS/stubs/hal/pwmout_api_stub.c → ...tests/UNITTESTS/doubles/pwmout_api_stub.c b/UNITTESTS/stubs/hal/pwmout_api_stub.c → ...tests/UNITTESTS/doubles/pwmout_api_stub.c
diff --git a/UNITTESTS/stubs/hal/us_ticker_stub.cpp → ...ests/UNITTESTS/doubles/us_ticker_stub.cpp b/UNITTESTS/stubs/hal/us_ticker_stub.cpp → ...ests/UNITTESTS/doubles/us_ticker_stub.cpp
diff --git a/UNITTESTS/stubs/hal/watchdog_api_stub.c → ...sts/UNITTESTS/doubles/watchdog_api_stub.c b/UNITTESTS/stubs/hal/watchdog_api_stub.c → ...sts/UNITTESTS/doubles/watchdog_api_stub.c