From fafa0c41ed584c0c5b3631d3dbb891e9b607541f Mon Sep 17 00:00:00 2001
From: Rajkumar Kanagaraj <rajkumar.kanagaraj@arm.com>
Date: Tue, 25 Aug 2020 15:18:22 +0100
Subject: [PATCH] Update UNITTESTS header reference

---
 .codecheckignore                    | 4 ++--
 UNITTESTS/CMakeLists.txt            | 1 +
 UNITTESTS/stubs/us_ticker_stub.cpp  | 2 +-
 UNITTESTS/stubs/watchdog_api_stub.c | 2 +-
 UNITTESTS/target_h/PinNames.h       | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.codecheckignore b/.codecheckignore
index bf9785794e..86d98b1ac7 100644
--- a/.codecheckignore
+++ b/.codecheckignore
@@ -19,14 +19,14 @@
 ^storage/filesystem/littlefsv2/littlefs/
 ^features/unsupported/
 ^hal/storage_abstraction
+^hal/tests/TESTS/mbed_hal/trng/pithy
+^hal/tests/TESTS/mbed_hal/trng/pithy
 ^platform/cxxsupport
 ^platform/tests/UNITTESTS
 ^events/tests/UNITTESTS
 ^rtos/source/TARGET_CORTEX/rtx4
 ^rtos/source/TARGET_CORTEX/rtx5
 ^targets
-^TESTS/mbed_hal/trng/pithy
-^TESTS/mbed_hal/trng/pithy
 ^tools
 ^UNITTESTS
 ^storage/blockdevice/tests/UNITTESTS
diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt
index 598c76ecdd..d149c3c8b9 100644
--- a/UNITTESTS/CMakeLists.txt
+++ b/UNITTESTS/CMakeLists.txt
@@ -126,6 +126,7 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../drivers/include/drivers"
   "${PROJECT_SOURCE_DIR}/../drivers/include/drivers/internal"
   "${PROJECT_SOURCE_DIR}/../hal"
+  "${PROJECT_SOURCE_DIR}/../hal/include"
   "${PROJECT_SOURCE_DIR}/../events/include"
   "${PROJECT_SOURCE_DIR}/../events/include/events/internal"
   "${PROJECT_SOURCE_DIR}/../events/source"
diff --git a/UNITTESTS/stubs/us_ticker_stub.cpp b/UNITTESTS/stubs/us_ticker_stub.cpp
index 69c96accee..b4514243c3 100644
--- a/UNITTESTS/stubs/us_ticker_stub.cpp
+++ b/UNITTESTS/stubs/us_ticker_stub.cpp
@@ -17,7 +17,7 @@
 
 
 #include "stdlib.h"
-#include "us_ticker_api.h"
+#include "hal/us_ticker_api.h"
 
 const ticker_data_t *get_us_ticker_data(void)
 {
diff --git a/UNITTESTS/stubs/watchdog_api_stub.c b/UNITTESTS/stubs/watchdog_api_stub.c
index 78e0802316..f6c061f224 100644
--- a/UNITTESTS/stubs/watchdog_api_stub.c
+++ b/UNITTESTS/stubs/watchdog_api_stub.c
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "watchdog_api.h"
+#include "hal/watchdog_api.h"
 
 #if DEVICE_WATCHDOG
 
diff --git a/UNITTESTS/target_h/PinNames.h b/UNITTESTS/target_h/PinNames.h
index 745ddda119..92fa9fb635 100644
--- a/UNITTESTS/target_h/PinNames.h
+++ b/UNITTESTS/target_h/PinNames.h
@@ -47,6 +47,6 @@ typedef enum {
 #ifdef __cplusplus
 }
 #endif
-#include "pinmap.h"
+#include "hal/pinmap.h"
 
 #endif