diff --git a/Kconfig.utestcases b/Kconfig.utestcases index 8bedaf2d401..c4d446348ef 100644 --- a/Kconfig.utestcases +++ b/Kconfig.utestcases @@ -9,7 +9,6 @@ if RT_USING_UTESTCASES rsource "components/utilities/utest/utest/Kconfig" rsource "src/utest/Kconfig" -rsource "examples/utest/testcases/cpp11/Kconfig" rsource "examples/utest/testcases/mm/Kconfig" rsource "examples/utest/testcases/tmpfs/Kconfig" @@ -22,6 +21,7 @@ rsource "components/drivers/serial/utest/Kconfig" rsource "components/drivers/smp_call/utest/Kconfig" rsource "components/dfs/utest/Kconfig" rsource "components/net/utest/Kconfig" +rsource "components/libc/cplusplus/utest/Kconfig" endif diff --git a/examples/utest/testcases/cpp11/Kconfig b/components/libc/cplusplus/utest/Kconfig similarity index 100% rename from examples/utest/testcases/cpp11/Kconfig rename to components/libc/cplusplus/utest/Kconfig diff --git a/examples/utest/testcases/cpp11/SConscript b/components/libc/cplusplus/utest/SConscript similarity index 100% rename from examples/utest/testcases/cpp11/SConscript rename to components/libc/cplusplus/utest/SConscript diff --git a/examples/utest/testcases/cpp11/tc_atomic.cpp b/components/libc/cplusplus/utest/tc_atomic.cpp similarity index 98% rename from examples/utest/testcases/cpp11/tc_atomic.cpp rename to components/libc/cplusplus/utest/tc_atomic.cpp index 4f9ca4b4d82..8b5bdbd9bad 100644 --- a/examples/utest/testcases/cpp11/tc_atomic.cpp +++ b/components/libc/cplusplus/utest/tc_atomic.cpp @@ -268,4 +268,4 @@ static void testcase(void) /* Test compare_exchange_weak operation */ UTEST_UNIT_RUN(test_compare_exchange_weak); } -UTEST_TC_EXPORT(testcase, "testcases.cpp11.atomic_tc", utest_tc_init, utest_tc_cleanup, 10); +UTEST_TC_EXPORT(testcase, "components.libc.cpp.atomic_tc", utest_tc_init, utest_tc_cleanup, 10); diff --git a/examples/utest/testcases/cpp11/tc_auto.cpp b/components/libc/cplusplus/utest/tc_auto.cpp similarity index 91% rename from examples/utest/testcases/cpp11/tc_auto.cpp rename to components/libc/cplusplus/utest/tc_auto.cpp index 370d89f0204..8818c23b891 100644 --- a/examples/utest/testcases/cpp11/tc_auto.cpp +++ b/components/libc/cplusplus/utest/tc_auto.cpp @@ -61,4 +61,4 @@ static void testcase(void) /* Test range-based for loop */ UTEST_UNIT_RUN(test_range_for); } -UTEST_TC_EXPORT(testcase, "testcases.cpp11.auto_tc", utest_tc_init, utest_tc_cleanup, 10); +UTEST_TC_EXPORT(testcase, "components.libc.cpp.auto_tc", utest_tc_init, utest_tc_cleanup, 10); diff --git a/examples/utest/testcases/cpp11/tc_lambda.cpp b/components/libc/cplusplus/utest/tc_lambda.cpp similarity index 91% rename from examples/utest/testcases/cpp11/tc_lambda.cpp rename to components/libc/cplusplus/utest/tc_lambda.cpp index 1e3f70bd9b2..061836005b3 100644 --- a/examples/utest/testcases/cpp11/tc_lambda.cpp +++ b/components/libc/cplusplus/utest/tc_lambda.cpp @@ -55,4 +55,4 @@ static void testcase(void) /* Test lambda with capture */ UTEST_UNIT_RUN(test_lambda_capture); } -UTEST_TC_EXPORT(testcase, "testcases.cpp11.lambda_tc", utest_tc_init, utest_tc_cleanup, 10); +UTEST_TC_EXPORT(testcase, "components.libc.cpp.lambda_tc", utest_tc_init, utest_tc_cleanup, 10); diff --git a/examples/utest/testcases/cpp11/tc_mutex.cpp b/components/libc/cplusplus/utest/tc_mutex.cpp similarity index 96% rename from examples/utest/testcases/cpp11/tc_mutex.cpp rename to components/libc/cplusplus/utest/tc_mutex.cpp index 12974fa7277..afa07648e4d 100644 --- a/examples/utest/testcases/cpp11/tc_mutex.cpp +++ b/components/libc/cplusplus/utest/tc_mutex.cpp @@ -117,4 +117,4 @@ static void testcase(void) /* Test locking multiple mutexes with std::lock */ UTEST_UNIT_RUN(test_lock_multiple); } -UTEST_TC_EXPORT(testcase, "testcases.cpp11.mutex_tc", utest_tc_init, utest_tc_cleanup, 10); +UTEST_TC_EXPORT(testcase, "components.libc.cpp.mutex_tc", utest_tc_init, utest_tc_cleanup, 10); diff --git a/examples/utest/testcases/cpp11/tc_smartptr.cpp b/components/libc/cplusplus/utest/tc_smartptr.cpp similarity index 91% rename from examples/utest/testcases/cpp11/tc_smartptr.cpp rename to components/libc/cplusplus/utest/tc_smartptr.cpp index 22064bbc173..1a9fa7eb116 100644 --- a/examples/utest/testcases/cpp11/tc_smartptr.cpp +++ b/components/libc/cplusplus/utest/tc_smartptr.cpp @@ -52,4 +52,4 @@ static void testcase(void) /* Test shared_ptr basic operations */ UTEST_UNIT_RUN(test_shared_ptr); } -UTEST_TC_EXPORT(testcase, "testcases.cpp11.smartptr_tc", utest_tc_init, utest_tc_cleanup, 10); +UTEST_TC_EXPORT(testcase, "components.libc.cpp.smartptr_tc", utest_tc_init, utest_tc_cleanup, 10); diff --git a/examples/utest/testcases/cpp11/tc_thread.cpp b/components/libc/cplusplus/utest/tc_thread.cpp similarity index 89% rename from examples/utest/testcases/cpp11/tc_thread.cpp rename to components/libc/cplusplus/utest/tc_thread.cpp index 21dc9c8bc8d..c60a9ab6025 100644 --- a/examples/utest/testcases/cpp11/tc_thread.cpp +++ b/components/libc/cplusplus/utest/tc_thread.cpp @@ -56,4 +56,4 @@ static void testcase(void) { UTEST_UNIT_RUN(test_thread); } -UTEST_TC_EXPORT(testcase, "testcases.cpp11.thread_tc", utest_tc_init, utest_tc_cleanup, 10); +UTEST_TC_EXPORT(testcase, "components.libc.cpp.thread_tc", utest_tc_init, utest_tc_cleanup, 10);