tests: logging: adjust the structure of logging test cases

Adjust the logging test case code to make them the same as other test
cases which deal with the CONFIG_USERSPACE used. It does not change
the original test logic, but just the file structure changed.

It also corrects the duplicated testsuite name of logging testcases.

Signed-off-by: Enjia Mai <enjia.mai@intel.com>

tests/subsys/logging/log_core_additional/CMakeLists.txt

@@ -4,8 +4,5 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(log_core_additional)
 
-if(${USERSPACE_TEST})
-target_sources(app PRIVATE src/log_test_user.c)
-else()
-target_sources(app PRIVATE src/log_test.c)
-endif()
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})

tests/subsys/logging/log_core_additional/log2.conf

@@ -1,6 +1,5 @@
 CONFIG_MAIN_THREAD_PRIORITY=5
 CONFIG_ZTEST=y
-CONFIG_TEST_USERSPACE=y
 CONFIG_TEST_LOGGING_DEFAULTS=n
 CONFIG_LOG=y
 CONFIG_LOG2_MODE_DEFERRED=y

tests/subsys/logging/log_core_additional/src/log_test.c

@@ -226,7 +226,7 @@ static bool log_test_process(bool bypass)
  * @addtogroup logging
  */
 
-static void test_log_domain_id(void)
+void test_log_domain_id(void)
 {
 	log_setup(false);
 
@@ -251,7 +251,7 @@ static void test_log_domain_id(void)
  * @addtogroup logging
  */
 
-static void test_log_sync(void)
+void test_log_sync(void)
 {
 	TC_PRINT("Logging synchronousely\n");
 
@@ -276,7 +276,7 @@ static void test_log_sync(void)
  * @addtogroup logging
  */
 
-static void test_log_early_logging(void)
+void test_log_early_logging(void)
 {
 	if (IS_ENABLED(CONFIG_LOG_IMMEDIATE)) {
 		ztest_test_skip();
@@ -322,7 +322,7 @@ static void test_log_early_logging(void)
  * @addtogroup logging
  */
 
-static void test_log_severity(void)
+void test_log_severity(void)
 {
 	log_setup(false);
 
@@ -351,7 +351,7 @@ static void test_log_severity(void)
  * @addtogroup logging
  */
 
-static void test_log_timestamping(void)
+void test_log_timestamping(void)
 {
 	stamp = 0U;
 
@@ -402,7 +402,7 @@ static void test_log_timestamping(void)
  */
 
 #define UART_BACKEND "log_backend_uart"
-static void test_multiple_backends(void)
+void test_multiple_backends(void)
 {
 	TC_PRINT("Test multiple backends");
 	/* enable both backend1 and backend2 */
@@ -431,7 +431,7 @@ static void test_multiple_backends(void)
  */
 
 #ifdef CONFIG_LOG_PROCESS_THREAD
-static void test_log_thread(void)
+void test_log_thread(void)
 {
 	uint32_t slabs_free, used, max;
 
@@ -465,7 +465,7 @@ static void test_log_thread(void)
 	zassert_equal(log_msg_mem_get_used(), 0, NULL);
 }
 #else
-static void test_log_thread(void)
+void test_log_thread(void)
 {
 	ztest_test_skip();
 }
@@ -563,13 +563,30 @@ void promote_log_thread(const struct k_thread *thread, void *user_data)
 	}
 }
 
+extern void test_log_from_user(void);
+extern void test_log_hexdump_from_user(void);
+extern void test_log_generic_user(void);
+extern void test_log_filter_set(void);
+extern void test_log_panic(void);
+
 /*test case main entry*/
 void test_main(void)
 {
 #ifdef CONFIG_LOG_PROCESS_THREAD
 	k_thread_foreach(promote_log_thread, NULL);
 #endif
-	ztest_test_suite(test_log_list,
+
+#ifdef CONFIG_USERSPACE
+	ztest_test_suite(test_log_core_additional,
+			 ztest_user_unit_test(test_log_from_user),
+			 ztest_user_unit_test(test_log_hexdump_from_user),
+			 ztest_user_unit_test(test_log_generic_user),
+			 ztest_user_unit_test(test_log_filter_set),
+			 ztest_user_unit_test(test_log_panic),
+			 ztest_user_unit_test(test_log_msg2_create_user));
+	ztest_run_test_suite(test_log_core_additional);
+#else
+	ztest_test_suite(test_log_core_additional,
 			 ztest_unit_test(test_multiple_backends),
 			 ztest_unit_test(test_log_generic),
 			 ztest_unit_test(test_log_domain_id),
@@ -578,8 +595,8 @@ void test_main(void)
 			 ztest_unit_test(test_log_early_logging),
 			 ztest_unit_test(test_log_sync),
 			 ztest_unit_test(test_log_thread),
-			 ztest_unit_test(test_log_msg2_create),
-			 ztest_user_unit_test(test_log_msg2_create_user)
+			 ztest_unit_test(test_log_msg2_create)
 			 );
-	ztest_run_test_suite(test_log_list);
+	ztest_run_test_suite(test_log_core_additional);
+#endif
 }

tests/subsys/logging/log_core_additional/src/log_test_user.c

@@ -70,7 +70,7 @@ static void call_log_generic(uint32_t source_id, const char *fmt, ...)
 }
 
 /* test log_generic() from user space */
-void test_log_generic(void)
+void test_log_generic_user(void)
 {
 	uint32_t source_id = 0;
 
@@ -99,14 +99,3 @@ void test_log_panic(void)
 
 	log_panic();
 }
-
-void test_main(void)
-{
-	ztest_test_suite(test_log_list,
-			 ztest_user_unit_test(test_log_from_user),
-			 ztest_user_unit_test(test_log_hexdump_from_user),
-			 ztest_user_unit_test(test_log_generic),
-			 ztest_user_unit_test(test_log_filter_set),
-			 ztest_user_unit_test(test_log_panic));
-	ztest_run_test_suite(test_log_list);
-}

tests/subsys/logging/log_output/src/log_output_test.c

@@ -149,11 +149,11 @@ void test_log_output_string(void)
 /*test case main entry*/
 void test_main(void)
 {
-	ztest_test_suite(test_log_message,
+	ztest_test_suite(test_log_output,
 		ztest_unit_test_setup_teardown(test_log_output_raw_string,
 					       setup, teardown),
 		ztest_unit_test_setup_teardown(test_log_output_string,
 					       setup, teardown)
 		);
-	ztest_run_test_suite(test_log_message);
+	ztest_run_test_suite(test_log_output);
 }