From 4106bcc67c1a54b36cf261e5f6c0d056f2ee65fe Mon Sep 17 00:00:00 2001 From: Jakob Gegeniger Date: Sun, 30 Mar 2025 23:12:20 +0200 Subject: [PATCH] tests: reorganization of tests --- core | 2 +- {utest => test/unitOnHost}/CMakeLists.txt | 2 +- {utest => test/unitOnHost}/ReadMe.md | 0 {utest => test/unitOnHost}/test_core.cmake | 0 test/{ => unitOnTarget}/CMakeLists.txt | 2 +- test/{ => unitOnTarget}/ReadMe.md | 0 test/{ => unitOnTarget}/dependencies.lock | 0 test/{ => unitOnTarget}/main/CMakeLists.txt | 0 test/{ => unitOnTarget}/main/unitTest.cpp | 0 test/{ => unitOnTarget}/sdkconfig | 0 test/{ => unitOnTarget}/sdkconfig.defaults | 0 11 files changed, 3 insertions(+), 3 deletions(-) rename {utest => test/unitOnHost}/CMakeLists.txt (88%) rename {utest => test/unitOnHost}/ReadMe.md (100%) rename {utest => test/unitOnHost}/test_core.cmake (100%) rename test/{ => unitOnTarget}/CMakeLists.txt (88%) rename test/{ => unitOnTarget}/ReadMe.md (100%) rename test/{ => unitOnTarget}/dependencies.lock (100%) rename test/{ => unitOnTarget}/main/CMakeLists.txt (100%) rename test/{ => unitOnTarget}/main/unitTest.cpp (100%) rename test/{ => unitOnTarget}/sdkconfig (100%) rename test/{ => unitOnTarget}/sdkconfig.defaults (100%) diff --git a/core b/core index 3041a17..c85bfa2 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 3041a17851ae8a9ddfe420134affa5517edb52c2 +Subproject commit c85bfa2afc665dbfc2b80af81e4919f613001ed4 diff --git a/utest/CMakeLists.txt b/test/unitOnHost/CMakeLists.txt similarity index 88% rename from utest/CMakeLists.txt rename to test/unitOnHost/CMakeLists.txt index 5fa8d11..197f034 100644 --- a/utest/CMakeLists.txt +++ b/test/unitOnHost/CMakeLists.txt @@ -20,7 +20,7 @@ project(UnitTests) find_package(doctest REQUIRED PATHS "/mingw64/lib/cmake") # target_link_libraries(${PROJECT_NAME} PRIVATE doctest::doctest) -addSubDirs_ofRoot("${CMAKE_CURRENT_LIST_DIR}/../components") +addSubDirs_ofRoot("${CMAKE_CURRENT_LIST_DIR}/../../components") diff --git a/utest/ReadMe.md b/test/unitOnHost/ReadMe.md similarity index 100% rename from utest/ReadMe.md rename to test/unitOnHost/ReadMe.md diff --git a/utest/test_core.cmake b/test/unitOnHost/test_core.cmake similarity index 100% rename from utest/test_core.cmake rename to test/unitOnHost/test_core.cmake diff --git a/test/CMakeLists.txt b/test/unitOnTarget/CMakeLists.txt similarity index 88% rename from test/CMakeLists.txt rename to test/unitOnTarget/CMakeLists.txt index ca1bb93..a642462 100644 --- a/test/CMakeLists.txt +++ b/test/unitOnTarget/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.16) # Include the components directory of the main application: # -set(EXTRA_COMPONENT_DIRS "../components ../managed_components") +set(EXTRA_COMPONENT_DIRS "../../components ../../managed_components") # Set the components to include the tests for. # This can be overriden from CMake cache: diff --git a/test/ReadMe.md b/test/unitOnTarget/ReadMe.md similarity index 100% rename from test/ReadMe.md rename to test/unitOnTarget/ReadMe.md diff --git a/test/dependencies.lock b/test/unitOnTarget/dependencies.lock similarity index 100% rename from test/dependencies.lock rename to test/unitOnTarget/dependencies.lock diff --git a/test/main/CMakeLists.txt b/test/unitOnTarget/main/CMakeLists.txt similarity index 100% rename from test/main/CMakeLists.txt rename to test/unitOnTarget/main/CMakeLists.txt diff --git a/test/main/unitTest.cpp b/test/unitOnTarget/main/unitTest.cpp similarity index 100% rename from test/main/unitTest.cpp rename to test/unitOnTarget/main/unitTest.cpp diff --git a/test/sdkconfig b/test/unitOnTarget/sdkconfig similarity index 100% rename from test/sdkconfig rename to test/unitOnTarget/sdkconfig diff --git a/test/sdkconfig.defaults b/test/unitOnTarget/sdkconfig.defaults similarity index 100% rename from test/sdkconfig.defaults rename to test/unitOnTarget/sdkconfig.defaults