diff --git a/.codecheckignore b/.codecheckignore index 51c45db48a2..2504e1191b5 100644 --- a/.codecheckignore +++ b/.codecheckignore @@ -22,6 +22,8 @@ ^platform/cxxsupport ^platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV ^platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM +^platform/mbed-trace +^platform/randlib ^platform/tests/UNITTESTS ^events/tests/UNITTESTS ^rtos/source/TARGET_CORTEX/rtx4 @@ -31,4 +33,4 @@ ^UNITTESTS ^storage/blockdevice/tests/UNITTESTS ^storage/kvstore/tests/UNITTESTS -^drivers/tests/UNITTESTS \ No newline at end of file +^drivers/tests/UNITTESTS diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt index d149c3c8b90..612155a15ee 100644 --- a/UNITTESTS/CMakeLists.txt +++ b/UNITTESTS/CMakeLists.txt @@ -114,6 +114,7 @@ set(unittest-includes-base "${PROJECT_SOURCE_DIR}/../features" "${PROJECT_SOURCE_DIR}/../platform/include" "${PROJECT_SOURCE_DIR}/../platform/include/platform" + "${PROJECT_SOURCE_DIR}/../platform/mbed-trace/include" "${PROJECT_SOURCE_DIR}/../storage/filesystem/littlefs/include" "${PROJECT_SOURCE_DIR}/../storage/filesystem/fat/include" "${PROJECT_SOURCE_DIR}/../storage/blockdevice/include" @@ -132,7 +133,6 @@ set(unittest-includes-base "${PROJECT_SOURCE_DIR}/../events/source" "${PROJECT_SOURCE_DIR}/../rtos/include" "${PROJECT_SOURCE_DIR}/../features/frameworks" - "${PROJECT_SOURCE_DIR}/../features/frameworks/mbed-trace" "${PROJECT_SOURCE_DIR}/../connectivity/libraries/nanostack-libservice" "${PROJECT_SOURCE_DIR}/../connectivity/libraries/nanostack-libservice/mbed-client-libservice" "${PROJECT_SOURCE_DIR}/../connectivity/netsocket/include" diff --git a/UNITTESTS/empty_baseline/unittest.cmake b/UNITTESTS/empty_baseline/unittest.cmake index 88fc3491126..34aae47f635 100644 --- a/UNITTESTS/empty_baseline/unittest.cmake +++ b/UNITTESTS/empty_baseline/unittest.cmake @@ -8,7 +8,7 @@ set(unittest-includes ${unittest-includes} .. ../connectivity/mbedtls/include/mbedtls/ ../connectivity/mbedtls/platform/inc/ - ../features/frameworks/mbed-trace/mbed-trace/ + ../platform/mbed-trace/include/mbed-trace/ ) set(unittest-test-sources diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/unittest.cmake index 96ce3752e2b..20bc3168805 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/unittest.cmake +++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/unittest.cmake @@ -9,7 +9,7 @@ set(unittest-includes ${unittest-includes} ../connectivity/cellular/include/cellular/framework/common ../connectivity/cellular/include/cellular/framework/AT ../connectivity/cellular/include/cellular/framework/device - ../features/frameworks/mbed-client-randlib/mbed-client-randlib + ../platform/randlib/include/mbed-client-randlib ../drivers ../hal ) diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/unittest.cmake index 91917ec709f..fad602356cf 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/unittest.cmake +++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/unittest.cmake @@ -8,7 +8,7 @@ set(unittest-includes ${unittest-includes} ../connectivity/cellular/tests/UNITTESTS/framework/common/util ../connectivity/cellular/include/cellular/framework/common ../connectivity/cellular/include/cellular/framework/AT - ../features/frameworks/mbed-client-randlib/mbed-client-randlib + ../platform/randlib/include/mbed-client-randlib ) # Source files diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/unittest.cmake index 7d714b550c0..07c7b9c4387 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/unittest.cmake +++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/unittest.cmake @@ -8,7 +8,7 @@ set(unittest-includes ${unittest-includes} ../connectivity/cellular/tests/UNITTESTS/framework/common/util ../connectivity/cellular/include/cellular/framework/common ../connectivity/cellular/include/cellular/framework/AT - ../features/frameworks/mbed-client-randlib/mbed-client-randlib + ../platform/randlib/include/mbed-client-randlib ) # Source files diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/unittest.cmake index 071c447b4b4..dc344876f98 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/unittest.cmake +++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/unittest.cmake @@ -8,7 +8,7 @@ set(unittest-includes ${unittest-includes} ../connectivity/cellular/tests/UNITTESTS/framework/common/util ../connectivity/cellular/include/cellular/framework/common ../connectivity/cellular/include/cellular/framework/AT - ../features/frameworks/mbed-client-randlib/mbed-client-randlib + ../platform/randlib/include/mbed-client-randlib ) # Source files diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/unittest.cmake index 7fdfcee9881..97fe9a230b7 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/unittest.cmake +++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/unittest.cmake @@ -8,7 +8,7 @@ set(unittest-includes ${unittest-includes} ../connectivity/cellular/tests/UNITTESTS/framework/common/util ../connectivity/cellular/include/cellular/framework/common ../connectivity/cellular/include/cellular/framework/AT - ../features/frameworks/mbed-client-randlib/mbed-client-randlib + ../platform/randlib/include/mbed-client-randlib ) # Source files diff --git a/connectivity/cellular/tests/UNITTESTS/framework/common/util/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/common/util/unittest.cmake index 7116a1d85d2..556c12a2610 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/common/util/unittest.cmake +++ b/connectivity/cellular/tests/UNITTESTS/framework/common/util/unittest.cmake @@ -7,7 +7,7 @@ set(unittest-includes ${unittest-includes} ../connectivity/cellular/tests/UNITTESTS/framework/common/util ../connectivity/cellular/include/cellular/framework/common - ../features/frameworks/mbed-client-randlib/mbed-client-randlib + ../platform/randlib/include/mbed-client-randlib ) # Source files diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/unittest.cmake index da1bb40f2d6..8a787df9c77 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/unittest.cmake +++ b/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/unittest.cmake @@ -9,7 +9,7 @@ set(unittest-includes ${unittest-includes} ../connectivity/cellular/tests/UNITTESTS/framework/common/util ../connectivity/cellular/include/cellular/framework/common ../connectivity/cellular/include/cellular/framework/AT - ../features/frameworks/mbed-client-randlib/mbed-client-randlib + ../platform/randlib/include/mbed-client-randlib ) diff --git a/connectivity/drivers/cellular/COMPONENT_STMOD_CELLULAR/README.md b/connectivity/drivers/cellular/COMPONENT_STMOD_CELLULAR/README.md index 4ce80705f09..395acc3d7cf 100644 --- a/connectivity/drivers/cellular/COMPONENT_STMOD_CELLULAR/README.md +++ b/connectivity/drivers/cellular/COMPONENT_STMOD_CELLULAR/README.md @@ -13,7 +13,7 @@ The STMOD+ Connector specification can be found [here](https://www.st.com/conten ## Debug print -mbed_trace feature is used: https://github.com/ARMmbed/mbed-os/blob/master/features/frameworks/mbed-trace/README.md +mbed_trace feature is used: https://github.com/ARMmbed/mbed-os/blob/master/platform/mbed-trace/README.md Enable it in your mbed_app.json file: diff --git a/drivers/source/SFDP.cpp b/drivers/source/SFDP.cpp index 193c707ff46..3c461b5cf57 100644 --- a/drivers/source/SFDP.cpp +++ b/drivers/source/SFDP.cpp @@ -26,8 +26,14 @@ #if (DEVICE_SPI || DEVICE_QSPI) -#include "features/frameworks/mbed-trace/mbed-trace/mbed_trace.h" +#if MBED_CONF_MBED_TRACE_ENABLE +#include "mbed-trace/mbed_trace.h" #define TRACE_GROUP "SFDP" +#else // MBED_CONF_MBED_TRACE_ENABLE +#define tr_info(...) +#define tr_error(...) +#define tr_debug(...) +#endif // MBED_CONF_MBED_TRACE_ENABLE namespace { diff --git a/features/frameworks/mbed-client-randlib/.mbedignore b/features/frameworks/mbed-client-randlib/.mbedignore deleted file mode 100644 index ba4eb1b31de..00000000000 --- a/features/frameworks/mbed-client-randlib/.mbedignore +++ /dev/null @@ -1,2 +0,0 @@ -linux/* -test/* diff --git a/features/frameworks/mbed-client-randlib/.yotta_ignore b/features/frameworks/mbed-client-randlib/.yotta_ignore deleted file mode 100644 index ab1cfb4ef2c..00000000000 --- a/features/frameworks/mbed-client-randlib/.yotta_ignore +++ /dev/null @@ -1 +0,0 @@ -test/* diff --git a/features/frameworks/mbed-trace/.gitignore b/platform/mbed-trace/.gitignore similarity index 100% rename from features/frameworks/mbed-trace/.gitignore rename to platform/mbed-trace/.gitignore diff --git a/features/frameworks/mbed-trace/.mbedignore b/platform/mbed-trace/.mbedignore similarity index 100% rename from features/frameworks/mbed-trace/.mbedignore rename to platform/mbed-trace/.mbedignore diff --git a/features/frameworks/mbed-trace/CMakeLists.txt b/platform/mbed-trace/CMakeLists.txt similarity index 99% rename from features/frameworks/mbed-trace/CMakeLists.txt rename to platform/mbed-trace/CMakeLists.txt index 86396b4a4cf..1b0db50b06b 100644 --- a/features/frameworks/mbed-trace/CMakeLists.txt +++ b/platform/mbed-trace/CMakeLists.txt @@ -15,4 +15,3 @@ set (MBED_TRACE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/source/mbed_trace.c) CREATE_LIBRARY(mbedTrace "${MBED_TRACE_SRC}" "") - diff --git a/features/frameworks/mbed-trace/CONTRIBUTING.md b/platform/mbed-trace/CONTRIBUTING.md similarity index 100% rename from features/frameworks/mbed-trace/CONTRIBUTING.md rename to platform/mbed-trace/CONTRIBUTING.md diff --git a/features/frameworks/mbed-trace/Jenkinsfile b/platform/mbed-trace/Jenkinsfile similarity index 98% rename from features/frameworks/mbed-trace/Jenkinsfile rename to platform/mbed-trace/Jenkinsfile index 2793e1c6bc9..8ac585c242a 100644 --- a/features/frameworks/mbed-trace/Jenkinsfile +++ b/platform/mbed-trace/Jenkinsfile @@ -82,7 +82,7 @@ def morpheusBuildStep(target, compilerLabel, toolchain) { execute("mbed --version") execute("echo https://github.com/armmbed/mbed-os/#6a0a86538c0b9b2bfcc4583b1e2b7fea8f4e71e9 > mbed-os.lib") execute("mbed deploy") - execute("rm -rf ./mbed-os/features/frameworks/mbed-trace") + execute("rm -rf ./mbed-os/platform/mbed-trace") execute("mbed compile -m ${target} -t ${toolchain} --library") setBuildStatus('SUCCESS', "build ${buildName}", "build done") } catch (err) { @@ -102,7 +102,7 @@ def morpheusBuildStep(target, compilerLabel, toolchain) { execute("echo \"https://github.com/ARMmbed/mbed-trace#${env.GIT_COMMIT_HASH}\" > mbed-trace.lib") execute("mbed new .") execute("mbed deploy") - execute("rm -rf ./mbed-os/features/frameworks/mbed-trace") + execute("rm -rf ./mbed-os/platform/mbed-trace") execute("rm -rf ./mbed-trace/example") execute("rm -rf ./mbed-trace/test") execute("mbed compile -t ${toolchain} -m ${target}") diff --git a/features/frameworks/mbed-trace/LICENSE b/platform/mbed-trace/LICENSE similarity index 100% rename from features/frameworks/mbed-trace/LICENSE rename to platform/mbed-trace/LICENSE diff --git a/features/frameworks/mbed-trace/Makefile.nanomesh b/platform/mbed-trace/Makefile.nanomesh similarity index 100% rename from features/frameworks/mbed-trace/Makefile.nanomesh rename to platform/mbed-trace/Makefile.nanomesh diff --git a/features/frameworks/mbed-trace/README.md b/platform/mbed-trace/README.md similarity index 100% rename from features/frameworks/mbed-trace/README.md rename to platform/mbed-trace/README.md diff --git a/features/frameworks/mbed-trace/mbed-trace/mbed_trace.h b/platform/mbed-trace/include/mbed-trace/mbed_trace.h similarity index 100% rename from features/frameworks/mbed-trace/mbed-trace/mbed_trace.h rename to platform/mbed-trace/include/mbed-trace/mbed_trace.h diff --git a/features/frameworks/mbed-trace/mbed_lib.json b/platform/mbed-trace/mbed_lib.json similarity index 100% rename from features/frameworks/mbed-trace/mbed_lib.json rename to platform/mbed-trace/mbed_lib.json diff --git a/features/frameworks/mbed-trace/source/CMakeLists.txt b/platform/mbed-trace/source/CMakeLists.txt similarity index 100% rename from features/frameworks/mbed-trace/source/CMakeLists.txt rename to platform/mbed-trace/source/CMakeLists.txt diff --git a/features/frameworks/mbed-trace/source/mbed_trace.c b/platform/mbed-trace/source/mbed_trace.c similarity index 100% rename from features/frameworks/mbed-trace/source/mbed_trace.c rename to platform/mbed-trace/source/mbed_trace.c diff --git a/features/frameworks/mbed-client-randlib/.gitignore b/platform/randlib/.gitignore similarity index 100% rename from features/frameworks/mbed-client-randlib/.gitignore rename to platform/randlib/.gitignore diff --git a/platform/randlib/.mbedignore b/platform/randlib/.mbedignore new file mode 100644 index 00000000000..89e8a0a7554 --- /dev/null +++ b/platform/randlib/.mbedignore @@ -0,0 +1,2 @@ +linux/* +tests/unit/* diff --git a/platform/randlib/.yotta_ignore b/platform/randlib/.yotta_ignore new file mode 100644 index 00000000000..13fec05b8af --- /dev/null +++ b/platform/randlib/.yotta_ignore @@ -0,0 +1 @@ +tests/unit/* diff --git a/features/frameworks/mbed-client-randlib/LICENSE b/platform/randlib/LICENSE similarity index 100% rename from features/frameworks/mbed-client-randlib/LICENSE rename to platform/randlib/LICENSE diff --git a/features/frameworks/mbed-client-randlib/Makefile b/platform/randlib/Makefile similarity index 100% rename from features/frameworks/mbed-client-randlib/Makefile rename to platform/randlib/Makefile diff --git a/features/frameworks/mbed-client-randlib/apache-2.0.txt b/platform/randlib/apache-2.0.txt similarity index 100% rename from features/frameworks/mbed-client-randlib/apache-2.0.txt rename to platform/randlib/apache-2.0.txt diff --git a/features/frameworks/mbed-client-randlib/mbed-client-randlib/platform/arm_hal_random.h b/platform/randlib/include/mbed-client-randlib/platform/arm_hal_random.h similarity index 100% rename from features/frameworks/mbed-client-randlib/mbed-client-randlib/platform/arm_hal_random.h rename to platform/randlib/include/mbed-client-randlib/platform/arm_hal_random.h diff --git a/features/frameworks/mbed-client-randlib/mbed-client-randlib/randLIB.h b/platform/randlib/include/mbed-client-randlib/randLIB.h similarity index 100% rename from features/frameworks/mbed-client-randlib/mbed-client-randlib/randLIB.h rename to platform/randlib/include/mbed-client-randlib/randLIB.h diff --git a/features/frameworks/mbed-client-randlib/mbed_lib.json b/platform/randlib/mbed_lib.json similarity index 100% rename from features/frameworks/mbed-client-randlib/mbed_lib.json rename to platform/randlib/mbed_lib.json diff --git a/features/frameworks/mbed-client-randlib/source/randLIB.c b/platform/randlib/source/randLIB.c similarity index 100% rename from features/frameworks/mbed-client-randlib/source/randLIB.c rename to platform/randlib/source/randLIB.c diff --git a/features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/Makefile b/platform/randlib/tests/unit/Makefile similarity index 98% rename from features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/Makefile rename to platform/randlib/tests/unit/Makefile index b353517548f..91cfcf981db 100644 --- a/features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/Makefile +++ b/platform/randlib/tests/unit/Makefile @@ -5,11 +5,11 @@ clean: else DIRS := $(filter-out ./, $(sort $(dir $(shell find . -name 'Makefile')))) -all: +all: for dir in $(DIRS); do \ cd $$dir; make gcov; cd ..;\ done - + clean: for dir in $(DIRS); do \ cd $$dir; make clean; cd ..;\ diff --git a/features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/MakefileWorker.mk b/platform/randlib/tests/unit/MakefileWorker.mk similarity index 99% rename from features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/MakefileWorker.mk rename to platform/randlib/tests/unit/MakefileWorker.mk index 2096ced0367..2bfbec0c823 100644 --- a/features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/MakefileWorker.mk +++ b/platform/randlib/tests/unit/MakefileWorker.mk @@ -261,7 +261,7 @@ ifeq ($(CPPUTEST_USE_MEM_LEAK_DETECTION), N) CPPUTEST_CPPFLAGS += -DCPPUTEST_MEM_LEAK_DETECTION_DISABLED else ifndef CPPUTEST_MEMLEAK_DETECTOR_NEW_MACRO_FILE - CPPUTEST_MEMLEAK_DETECTOR_NEW_MACRO_FILE = -include $(CPPUTEST_HOME)/include/CppUTest/MemoryLeakDetectorNewMacros.h + CPPUTEST_MEMLEAK_DETECTOR_NEW_MACRO_FILE = -include $(CPPUTEST_HOME)/include/CppUTest/MemoryLeakDetectorNewMacros.h endif ifndef CPPUTEST_MEMLEAK_DETECTOR_MALLOC_MACRO_FILE CPPUTEST_MEMLEAK_DETECTOR_MALLOC_MACRO_FILE = -include $(CPPUTEST_HOME)/include/CppUTest/MemoryLeakDetectorMallocMacros.h @@ -270,7 +270,7 @@ endif ifeq ($(CPPUTEST_ENABLE_DEBUG), Y) CPPUTEST_CXXFLAGS += -g - CPPUTEST_CFLAGS += -g + CPPUTEST_CFLAGS += -g CPPUTEST_LDFLAGS += -g endif diff --git a/features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/makefile_defines.txt b/platform/randlib/tests/unit/makefile_defines.txt similarity index 100% rename from features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/makefile_defines.txt rename to platform/randlib/tests/unit/makefile_defines.txt diff --git a/features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/Makefile b/platform/randlib/tests/unit/randlib/Makefile similarity index 99% rename from features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/Makefile rename to platform/randlib/tests/unit/randlib/Makefile index 12d97840f62..759be85d909 100644 --- a/features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/Makefile +++ b/platform/randlib/tests/unit/randlib/Makefile @@ -15,4 +15,3 @@ TEST_SRC_FILES = \ include ../MakefileWorker.mk CPPUTESTFLAGS += -DFEA_TRACE_SUPPORT -DRANDLIB_PRNG - diff --git a/features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/main.cpp b/platform/randlib/tests/unit/randlib/main.cpp similarity index 99% rename from features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/main.cpp rename to platform/randlib/tests/unit/randlib/main.cpp index becceb65ca9..2ace856ecd5 100644 --- a/features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/main.cpp +++ b/platform/randlib/tests/unit/randlib/main.cpp @@ -12,4 +12,3 @@ int main(int ac, char **av) } IMPORT_TEST_GROUP(randLIB); - diff --git a/features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/randlibtest.cpp b/platform/randlib/tests/unit/randlib/randlibtest.cpp similarity index 100% rename from features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/randlibtest.cpp rename to platform/randlib/tests/unit/randlib/randlibtest.cpp diff --git a/features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/test_randlib.c b/platform/randlib/tests/unit/randlib/test_randlib.c similarity index 100% rename from features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/test_randlib.c rename to platform/randlib/tests/unit/randlib/test_randlib.c diff --git a/features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/test_randlib.h b/platform/randlib/tests/unit/randlib/test_randlib.h similarity index 99% rename from features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/test_randlib.h rename to platform/randlib/tests/unit/randlib/test_randlib.h index a1949e6d05e..54909d470fa 100644 --- a/features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/test_randlib.h +++ b/platform/randlib/tests/unit/randlib/test_randlib.h @@ -32,4 +32,3 @@ bool test_randLIB_randomise_base(); #endif #endif // TEST_RANDLIB_H - diff --git a/features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/run_tests b/platform/randlib/tests/unit/run_tests similarity index 100% rename from features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/run_tests rename to platform/randlib/tests/unit/run_tests diff --git a/features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/stubs/open_stub.c b/platform/randlib/tests/unit/stubs/open_stub.c similarity index 100% rename from features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/stubs/open_stub.c rename to platform/randlib/tests/unit/stubs/open_stub.c diff --git a/features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/stubs/random_stub.c b/platform/randlib/tests/unit/stubs/random_stub.c similarity index 100% rename from features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/stubs/random_stub.c rename to platform/randlib/tests/unit/stubs/random_stub.c diff --git a/storage/kvstore/source/FileSystemStore.cpp b/storage/kvstore/source/FileSystemStore.cpp index 828ff5915bd..7f5ad5d3200 100644 --- a/storage/kvstore/source/FileSystemStore.cpp +++ b/storage/kvstore/source/FileSystemStore.cpp @@ -26,7 +26,7 @@ #include #include -#include "mbed_trace.h" +#include "mbed-trace/mbed_trace.h" #define TRACE_GROUP "FSST" #define FSST_REVISION 1 diff --git a/storage/kvstore/tests/UNITTESTS/FileSystemStore/unittest.cmake b/storage/kvstore/tests/UNITTESTS/FileSystemStore/unittest.cmake index e9246278e94..30230a6aaec 100644 --- a/storage/kvstore/tests/UNITTESTS/FileSystemStore/unittest.cmake +++ b/storage/kvstore/tests/UNITTESTS/FileSystemStore/unittest.cmake @@ -5,7 +5,7 @@ set(unittest-includes ${unittest-includes} . .. - ../features/frameworks/mbed-trace/mbed-trace + ../platform/mbed-trace/mbed-trace ) set(unittest-sources @@ -15,7 +15,7 @@ set(unittest-sources ../storage/filesystem/source/Dir.cpp ../storage/filesystem/source/File.cpp ../storage/filesystem/source/FileSystem.cpp - ../features/frameworks/mbed-trace/source/mbed_trace.c + ../platform/mbed-trace/source/mbed_trace.c ../storage/filesystem/littlefs/littlefs/lfs_util.c ../storage/filesystem/littlefs/littlefs/lfs.c ../platform/source/FileBase.cpp diff --git a/storage/kvstore/tests/UNITTESTS/TDBStore/unittest.cmake b/storage/kvstore/tests/UNITTESTS/TDBStore/unittest.cmake index 373173ef2d2..dccc8407771 100644 --- a/storage/kvstore/tests/UNITTESTS/TDBStore/unittest.cmake +++ b/storage/kvstore/tests/UNITTESTS/TDBStore/unittest.cmake @@ -6,7 +6,7 @@ set(unittest-includes ${unittest-includes} . .. - ../features/frameworks/mbed-trace/mbed-trace + ../platform/mbed-trace/mbed-trace ) set(unittest-sources @@ -14,7 +14,7 @@ set(unittest-sources ../storage/blockdevice/source/HeapBlockDevice.cpp ../storage/blockdevice/source/BufferedBlockDevice.cpp ../storage/kvstore/source/TDBStore.cpp - ../features/frameworks/mbed-trace/source/mbed_trace.c + ../platform/mbed-trace/source/mbed_trace.c stubs/mbed_atomic_stub.c stubs/mbed_assert_stub.cpp stubs/mbed_error.c