From 6a5f3ae6610cffe7a438b38230eac91110c08ad6 Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Wed, 23 Jun 2021 04:20:36 -0700 Subject: [PATCH] CMake: Move rtos stubs sources to the mbed-os/rtos directory Move the rtos stub library into the rtos component directory. so we can avoid duplicating the mbed-os source tree in a central UNITTESTS folder. --- UNITTESTS/stubs/CMakeLists.txt | 1 - rtos/CMakeLists.txt | 4 ++++ rtos/tests/.mbedignore | 1 + rtos/tests/UNITTESTS/CMakeLists.txt | 4 ++++ .../tests/UNITTESTS/doubles}/CMakeLists.txt | 11 ++++++++--- .../UNITTESTS/doubles}/ConditionVariable_stub.cpp | 0 .../tests/UNITTESTS/doubles}/Kernel_stub.cpp | 0 .../tests/UNITTESTS/doubles}/Mutex_stub.cpp | 0 .../tests/UNITTESTS/doubles}/Semaphore_stub.cpp | 0 .../tests/UNITTESTS/doubles}/ThisThread_stub.cpp | 0 .../tests/UNITTESTS/doubles}/Thread_stub.cpp | 0 .../tests/UNITTESTS/doubles}/mbed_rtos_rtx_stub.c | 0 .../tests/UNITTESTS/doubles}/rtx_mutex_stub.c | 0 13 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 rtos/tests/.mbedignore create mode 100644 rtos/tests/UNITTESTS/CMakeLists.txt rename {UNITTESTS/stubs/rtos => rtos/tests/UNITTESTS/doubles}/CMakeLists.txt (69%) rename {UNITTESTS/stubs/rtos => rtos/tests/UNITTESTS/doubles}/ConditionVariable_stub.cpp (100%) rename {UNITTESTS/stubs/rtos => rtos/tests/UNITTESTS/doubles}/Kernel_stub.cpp (100%) rename {UNITTESTS/stubs/rtos => rtos/tests/UNITTESTS/doubles}/Mutex_stub.cpp (100%) rename {UNITTESTS/stubs/rtos => rtos/tests/UNITTESTS/doubles}/Semaphore_stub.cpp (100%) rename {UNITTESTS/stubs/rtos => rtos/tests/UNITTESTS/doubles}/ThisThread_stub.cpp (100%) rename {UNITTESTS/stubs/rtos => rtos/tests/UNITTESTS/doubles}/Thread_stub.cpp (100%) rename {UNITTESTS/stubs/rtos => rtos/tests/UNITTESTS/doubles}/mbed_rtos_rtx_stub.c (100%) rename {UNITTESTS/stubs/rtos => rtos/tests/UNITTESTS/doubles}/rtx_mutex_stub.c (100%) diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt index 69195ef31e..ab81356612 100644 --- a/UNITTESTS/stubs/CMakeLists.txt +++ b/UNITTESTS/stubs/CMakeLists.txt @@ -123,7 +123,6 @@ add_subdirectory(connectivity) add_subdirectory(events) add_subdirectory(hal) add_subdirectory(platform) -add_subdirectory(rtos) add_subdirectory(storage) add_library(mbed-stubs INTERFACE) diff --git a/rtos/CMakeLists.txt b/rtos/CMakeLists.txt index 9e2194d12d..ab9d3082ea 100644 --- a/rtos/CMakeLists.txt +++ b/rtos/CMakeLists.txt @@ -1,6 +1,10 @@ # Copyright (c) 2020 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() + target_include_directories(mbed-core INTERFACE . diff --git a/rtos/tests/.mbedignore b/rtos/tests/.mbedignore new file mode 100644 index 0000000000..e28badb677 --- /dev/null +++ b/rtos/tests/.mbedignore @@ -0,0 +1 @@ +UNITTESTS/* diff --git a/rtos/tests/UNITTESTS/CMakeLists.txt b/rtos/tests/UNITTESTS/CMakeLists.txt new file mode 100644 index 0000000000..b632a73f47 --- /dev/null +++ b/rtos/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/rtos/CMakeLists.txt b/rtos/tests/UNITTESTS/doubles/CMakeLists.txt similarity index 69% rename from UNITTESTS/stubs/rtos/CMakeLists.txt rename to rtos/tests/UNITTESTS/doubles/CMakeLists.txt index fc9a759b8d..b3666dc5bd 100644 --- a/UNITTESTS/stubs/rtos/CMakeLists.txt +++ b/rtos/tests/UNITTESTS/doubles/CMakeLists.txt @@ -3,6 +3,8 @@ add_library(mbed-stubs-rtos) +add_definitions(-DUNITTEST) + target_sources(mbed-stubs-rtos PRIVATE ConditionVariable_stub.cpp @@ -16,7 +18,10 @@ target_sources(mbed-stubs-rtos ) target_link_libraries(mbed-stubs-rtos - PRIVATE - mbed-headers - mbed-stubs-headers + PRIVATE + mbed-headers-base + mbed-headers-rtos + mbed-headers-platform + mbed-headers-drivers + mbed-headers-hal ) diff --git a/UNITTESTS/stubs/rtos/ConditionVariable_stub.cpp b/rtos/tests/UNITTESTS/doubles/ConditionVariable_stub.cpp similarity index 100% rename from UNITTESTS/stubs/rtos/ConditionVariable_stub.cpp rename to rtos/tests/UNITTESTS/doubles/ConditionVariable_stub.cpp diff --git a/UNITTESTS/stubs/rtos/Kernel_stub.cpp b/rtos/tests/UNITTESTS/doubles/Kernel_stub.cpp similarity index 100% rename from UNITTESTS/stubs/rtos/Kernel_stub.cpp rename to rtos/tests/UNITTESTS/doubles/Kernel_stub.cpp diff --git a/UNITTESTS/stubs/rtos/Mutex_stub.cpp b/rtos/tests/UNITTESTS/doubles/Mutex_stub.cpp similarity index 100% rename from UNITTESTS/stubs/rtos/Mutex_stub.cpp rename to rtos/tests/UNITTESTS/doubles/Mutex_stub.cpp diff --git a/UNITTESTS/stubs/rtos/Semaphore_stub.cpp b/rtos/tests/UNITTESTS/doubles/Semaphore_stub.cpp similarity index 100% rename from UNITTESTS/stubs/rtos/Semaphore_stub.cpp rename to rtos/tests/UNITTESTS/doubles/Semaphore_stub.cpp diff --git a/UNITTESTS/stubs/rtos/ThisThread_stub.cpp b/rtos/tests/UNITTESTS/doubles/ThisThread_stub.cpp similarity index 100% rename from UNITTESTS/stubs/rtos/ThisThread_stub.cpp rename to rtos/tests/UNITTESTS/doubles/ThisThread_stub.cpp diff --git a/UNITTESTS/stubs/rtos/Thread_stub.cpp b/rtos/tests/UNITTESTS/doubles/Thread_stub.cpp similarity index 100% rename from UNITTESTS/stubs/rtos/Thread_stub.cpp rename to rtos/tests/UNITTESTS/doubles/Thread_stub.cpp diff --git a/UNITTESTS/stubs/rtos/mbed_rtos_rtx_stub.c b/rtos/tests/UNITTESTS/doubles/mbed_rtos_rtx_stub.c similarity index 100% rename from UNITTESTS/stubs/rtos/mbed_rtos_rtx_stub.c rename to rtos/tests/UNITTESTS/doubles/mbed_rtos_rtx_stub.c diff --git a/UNITTESTS/stubs/rtos/rtx_mutex_stub.c b/rtos/tests/UNITTESTS/doubles/rtx_mutex_stub.c similarity index 100% rename from UNITTESTS/stubs/rtos/rtx_mutex_stub.c rename to rtos/tests/UNITTESTS/doubles/rtx_mutex_stub.c