From 88410a5f853e4a18ce29dc264ff592d9b20f62ed Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Wed, 23 Jun 2021 07:21:39 -0700 Subject: [PATCH] CMake: Move events stubs sources to the mbed-os/events directory Move the events stub into the events component directory. so we can avoid duplicating the mbed-os source tree in a central UNITTESTS folder. --- UNITTESTS/stubs/CMakeLists.txt | 1 - events/tests/UNITTESTS/CMakeLists.txt | 1 + .../events => events/tests/UNITTESTS/doubles}/CMakeLists.txt | 2 +- events/tests/UNITTESTS/{stubs => doubles}/EqueuePosix_stub.c | 0 .../tests/UNITTESTS/doubles}/EventFlags_stub.cpp | 0 .../tests/UNITTESTS/doubles}/EventQueue_stub.cpp | 0 .../events => events/tests/UNITTESTS/doubles}/equeue_stub.c | 0 .../tests/UNITTESTS/doubles}/mbed_shared_queues_stub.cpp | 0 8 files changed, 2 insertions(+), 2 deletions(-) rename {UNITTESTS/stubs/events => events/tests/UNITTESTS/doubles}/CMakeLists.txt (83%) rename events/tests/UNITTESTS/{stubs => doubles}/EqueuePosix_stub.c (100%) rename {UNITTESTS/stubs/events => events/tests/UNITTESTS/doubles}/EventFlags_stub.cpp (100%) rename {UNITTESTS/stubs/events => events/tests/UNITTESTS/doubles}/EventQueue_stub.cpp (100%) rename {UNITTESTS/stubs/events => events/tests/UNITTESTS/doubles}/equeue_stub.c (100%) rename {UNITTESTS/stubs/events => events/tests/UNITTESTS/doubles}/mbed_shared_queues_stub.cpp (100%) diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt index a81923a17d..dddc151af9 100644 --- a/UNITTESTS/stubs/CMakeLists.txt +++ b/UNITTESTS/stubs/CMakeLists.txt @@ -62,7 +62,6 @@ target_include_directories(mbed-stubs-headers ) add_subdirectory(connectivity) -add_subdirectory(events) add_library(mbed-stubs INTERFACE) diff --git a/events/tests/UNITTESTS/CMakeLists.txt b/events/tests/UNITTESTS/CMakeLists.txt index 0c295bbc93..5b01cbedbf 100644 --- a/events/tests/UNITTESTS/CMakeLists.txt +++ b/events/tests/UNITTESTS/CMakeLists.txt @@ -1,4 +1,5 @@ # Copyright (c) 2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 +add_subdirectory(doubles) add_subdirectory(equeue) diff --git a/UNITTESTS/stubs/events/CMakeLists.txt b/events/tests/UNITTESTS/doubles/CMakeLists.txt similarity index 83% rename from UNITTESTS/stubs/events/CMakeLists.txt rename to events/tests/UNITTESTS/doubles/CMakeLists.txt index c0127aab56..b7bf0eef80 100644 --- a/UNITTESTS/stubs/events/CMakeLists.txt +++ b/events/tests/UNITTESTS/doubles/CMakeLists.txt @@ -6,7 +6,7 @@ add_library(mbed-stubs-events) target_sources(mbed-stubs-events PRIVATE equeue_stub.c - ${mbed-os_SOURCE_DIR}/events/tests/UNITTESTS/stubs/EqueuePosix_stub.c + EqueuePosix_stub.c EventFlags_stub.cpp EventQueue_stub.cpp mbed_shared_queues_stub.cpp diff --git a/events/tests/UNITTESTS/stubs/EqueuePosix_stub.c b/events/tests/UNITTESTS/doubles/EqueuePosix_stub.c similarity index 100% rename from events/tests/UNITTESTS/stubs/EqueuePosix_stub.c rename to events/tests/UNITTESTS/doubles/EqueuePosix_stub.c diff --git a/UNITTESTS/stubs/events/EventFlags_stub.cpp b/events/tests/UNITTESTS/doubles/EventFlags_stub.cpp similarity index 100% rename from UNITTESTS/stubs/events/EventFlags_stub.cpp rename to events/tests/UNITTESTS/doubles/EventFlags_stub.cpp diff --git a/UNITTESTS/stubs/events/EventQueue_stub.cpp b/events/tests/UNITTESTS/doubles/EventQueue_stub.cpp similarity index 100% rename from UNITTESTS/stubs/events/EventQueue_stub.cpp rename to events/tests/UNITTESTS/doubles/EventQueue_stub.cpp diff --git a/UNITTESTS/stubs/events/equeue_stub.c b/events/tests/UNITTESTS/doubles/equeue_stub.c similarity index 100% rename from UNITTESTS/stubs/events/equeue_stub.c rename to events/tests/UNITTESTS/doubles/equeue_stub.c diff --git a/UNITTESTS/stubs/events/mbed_shared_queues_stub.cpp b/events/tests/UNITTESTS/doubles/mbed_shared_queues_stub.cpp similarity index 100% rename from UNITTESTS/stubs/events/mbed_shared_queues_stub.cpp rename to events/tests/UNITTESTS/doubles/mbed_shared_queues_stub.cpp