tests: allow unsupported tests to be skipped

nashif · Anas Nashif · commit 7a5ff13703a0 · 2018-04-25T14:18:15.000+05:30
Instead of completely excluding those tests, mark them as skipped and
provide an noop function that marks the test as skipped where test is
not supported.

Signed-off-by: Anas Nashif &lt;anas.nashif@intel.com&gt;
diff --git a/tests/drivers/uart/uart_basic_api/src/main.c b/tests/drivers/uart/uart_basic_api/src/main.c
@@ -20,6 +20,18 @@ TC_CMD_DEFINE(test_uart_poll_in)
 TC_CMD_DEFINE(test_uart_poll_out)
 #endif
 
+#ifndef CONFIG_UART_INTERRUPT_DRIVEN
+void test_uart_fifo_fill(void)
+{
+	ztest_test_skip();
+}
+
+void test_uart_fifo_read(void)
+{
+	ztest_test_skip();
+}
+#endif
+
 void test_main(void)
 {
 #ifdef CONFIG_CONSOLE_SHELL
@@ -35,10 +47,8 @@ void test_main(void)
 	shell_register_default_module("uart");
 #else
 	ztest_test_suite(uart_basic_test,
-#ifdef CONFIG_UART_INTERRUPT_DRIVEN
 			 ztest_unit_test(test_uart_fifo_fill),
 			 ztest_unit_test(test_uart_fifo_read),
-#endif
 			 ztest_unit_test(test_uart_poll_in),
 			 ztest_unit_test(test_uart_poll_out));
 	ztest_run_test_suite(uart_basic_test);
diff --git a/tests/drivers/watchdog/wdt_basic_api/src/main.c b/tests/drivers/watchdog/wdt_basic_api/src/main.c
@@ -14,19 +14,13 @@
 #include <zephyr.h>
 #include <ztest.h>
 
-#ifdef INT_RESET
 extern void test_wdt_int_reset_26(void);
-#else
 extern void test_wdt_reset_26(void);
-#endif
 
 void test_main(void)
 {
 	ztest_test_suite(wdt_basic_test,
-#ifdef INT_RESET
-			 ztest_unit_test(test_wdt_int_reset_26));
-#else
+			 ztest_unit_test(test_wdt_int_reset_26),
 			 ztest_unit_test(test_wdt_reset_26));
-#endif
 	ztest_run_test_suite(wdt_basic_test);
 }
diff --git a/tests/kernel/common/CMakeLists.txt b/tests/kernel/common/CMakeLists.txt
@@ -6,14 +6,18 @@ target_sources(app PRIVATE
 	src/bitfield.c
   )
 endif()
+if(CONFIG_PRINTK)
+target_sources(app PRIVATE
+	src/printk.c
+  )
+endif()
 target_sources(app PRIVATE
 	src/atomic.c
 	src/byteorder.c
 	src/clock.c
 	src/dlist.c
 	src/intmath.c
 	src/main.c
-	src/printk.c
 	src/slist.c
 	src/timeout_order.c
 	src/multilib.c
diff --git a/tests/kernel/common/src/main.c b/tests/kernel/common/src/main.c
@@ -12,7 +12,6 @@
 extern void test_byteorder_memcpy_swap(void);
 extern void test_byteorder_mem_swap(void);
 extern void test_atomic(void);
-extern void test_bitfield(void);
 extern void test_intmath(void);
 extern void test_printk(void);
 extern void test_slist(void);
@@ -21,6 +20,21 @@ extern void test_timeout_order(void);
 extern void test_clock_cycle(void);
 extern void test_clock_uptime(void);
 extern void test_multilib(void);
+#ifdef CONFIG_ARM
+void test_bitfield(void)
+{
+	ztest_test_skip();
+}
+#else
+extern void test_bitfield(void);
+#endif
+
+#ifndef CONFIG_PRINTK
+void test_printk(void)
+{
+	ztest_test_skip();
+}
+#endif
 
 
 static void test_version(void)
@@ -42,12 +56,8 @@ void test_main(void)
 			 ztest_unit_test(test_byteorder_memcpy_swap),
 			 ztest_unit_test(test_byteorder_mem_swap),
 			 ztest_unit_test(test_atomic),
-#ifndef CONFIG_ARM
 			 ztest_unit_test(test_bitfield),
-#endif
-#ifdef CONFIG_PRINTK
 			 ztest_unit_test(test_printk),
-#endif
 			 ztest_unit_test(test_slist),
 			 ztest_unit_test(test_dlist),
 			 ztest_unit_test(test_intmath),
diff --git a/tests/kernel/device/src/main.c b/tests/kernel/device/src/main.c
@@ -84,16 +84,24 @@ void test_dummy_device_pm(void)
 
 	build_suspend_device_list();
 }
+#else
+static void build_suspend_device_list(void)
+{
+	ztest_test_skip();
+}
+
+void test_dummy_device_pm(void)
+{
+	ztest_test_skip();
+}
 #endif
 
 
 void test_main(void)
 {
 	ztest_test_suite(device,
-#ifdef CONFIG_DEVICE_POWER_MANAGEMENT
 			 ztest_unit_test(test_dummy_device_pm),
 			 ztest_unit_test(build_suspend_device_list),
-#endif
 			 ztest_unit_test(test_dummy_device),
 			 ztest_unit_test(test_bogus_dynamic_name),
 			 ztest_unit_test(test_dynamic_name));
diff --git a/tests/kernel/mem_protect/protection/src/main.c b/tests/kernel/mem_protect/protection/src/main.c
@@ -170,19 +170,37 @@ static void exec_heap(void)
 	k_free(heap_buf);
 	zassert_unreachable("Execute from heap did not fault");
 }
+#else
+static void exec_heap(void)
+{
+	ztest_test_skip();
+}
 #endif
+
+#else
+static void exec_data(void)
+{
+	ztest_test_skip();
+}
+
+static void exec_stack(void)
+{
+	ztest_test_skip();
+}
+
+static void exec_heap(void)
+{
+	ztest_test_skip();
+}
+
 #endif /* NO_EXECUTE_SUPPORT */
 
 void test_main(void)
 {
 	ztest_test_suite(protection,
-#ifdef NO_EXECUTE_SUPPORT
 			 ztest_unit_test(exec_data),
 			 ztest_unit_test(exec_stack),
-#if (CONFIG_HEAP_MEM_POOL_SIZE > 0)
 			 ztest_unit_test(exec_heap),
-#endif
-#endif /* NO_EXECUTE_SUPPORT */
 			 ztest_unit_test(write_ro),
 			 ztest_unit_test(write_text)
 		);
diff --git a/tests/kernel/pipe/pipe/src/main.c b/tests/kernel/pipe/pipe/src/main.c
@@ -19,9 +19,7 @@ extern void test_pipe_timeout(void);
 extern void test_pipe_get_on_empty_pipe(void);
 extern void test_pipe_forever_timeout(void);
 extern void test_pipe_get_timeout(void);
-#ifdef CONFIG_USERSPACE
 extern void test_pipe_get_invalid_size(void);
-#endif
 
 extern struct k_pipe test_pipe;
 extern struct k_sem put_sem, get_sem, sync_sem, multiple_send_sem;
@@ -44,10 +42,8 @@ void test_main(void)
 			 ztest_user_unit_test(test_pipe_timeout),
 			 ztest_user_unit_test(test_pipe_get_on_empty_pipe),
 			 ztest_user_unit_test(test_pipe_forever_timeout),
-			 ztest_user_unit_test(test_pipe_get_timeout)
-#ifdef CONFIG_USERSPACE
-			 , ztest_user_unit_test(test_pipe_get_invalid_size)
-#endif
+			 ztest_user_unit_test(test_pipe_get_timeout),
+			 ztest_user_unit_test(test_pipe_get_invalid_size)
 			 );
 
 	ztest_run_test_suite(test_pipe);
diff --git a/tests/kernel/pipe/pipe/src/test_pipe.c b/tests/kernel/pipe/pipe/src/test_pipe.c
@@ -803,4 +803,9 @@ void test_pipe_get_invalid_size(void)
 
 	zassert_unreachable("fault didn't occur for min_xfer <= bytes_to_read");
 }
+#else
+void test_pipe_get_invalid_size(void)
+{
+	ztest_test_skip();
+}
 #endif
diff --git a/tests/lib/sprintf/src/main.c b/tests/lib/sprintf/src/main.c
@@ -55,7 +55,6 @@ union raw_double_u {
 	};
 };
 
-#ifdef CONFIG_FLOAT
 /**
  *
  * @brief Test sprintf with doubles
@@ -67,6 +66,11 @@ void test_sprintf_double(void)
 	char buffer[100];
 	union raw_double_u var;
 
+#ifndef CONFIG_FLOAT
+	ztest_test_skip();
+	return;
+#endif
+
 	var.u1 = 0x00000000;
 	var.u2 = 0x7ff00000;    /* Bit pattern for +INF (double) */
 	sprintf(buffer, "%f", var.d);
@@ -164,7 +168,6 @@ void test_sprintf_double(void)
 		     "sprintf(1.234E+009) - incorrect "
 		     "output '%s'\n", buffer);
 }
-#endif /* CONFIG_FLOAT */
 
 /**
  * @brief A test wrapper for vsnprintf()
@@ -517,9 +520,7 @@ void test_sprintf_string(void)
 void test_main(void)
 {
 	ztest_test_suite(test_sprintf,
-#ifdef CONFIG_FLOAT
 			 ztest_unit_test(test_sprintf_double),
-#endif
 			 ztest_unit_test(test_sprintf_integer),
 			 ztest_unit_test(test_vsprintf),
 			 ztest_unit_test(test_vsnprintf),
diff --git a/tests/net/trickle/src/main.c b/tests/net/trickle/src/main.c
@@ -144,22 +144,20 @@ static void test_trickle_1_wait(void)
 }
 
 #if CHECK_LONG_TIMEOUT > 0
-static bool test_trickle_1_wait_long(void)
+static void test_trickle_1_wait_long(void)
 {
 	cb_1_called = false;
 	k_sem_take(&wait, WAIT_TIME_LONG);
 
-	if (!cb_1_called) {
-		TC_ERROR("Trickle 1 no timeout\n");
-		return false;
-	}
+	zassert_true(!cb_1_called, "Trickle 1 no timeout\n");
 
-	if (!net_trickle_is_running(&t1)) {
-		TC_ERROR("Trickle 1 not running\n");
-		return false;
-	}
+	zassert_true(!net_trickle_is_running(&t1), "Trickle 1 not running\n");
 
-	return true;
+}
+#else
+static void test_trickle_1_wait_long(void)
+{
+	ztest_test_skip();
 }
 #endif
 
@@ -213,9 +211,7 @@ void test_main(void)
 			ztest_unit_test(test_trickle_2_inc),
 			ztest_unit_test(test_trickle_2_status),
 			ztest_unit_test(test_trickle_1_status),
-#if CHECK_LONG_TIMEOUT > 0
 			ztest_unit_test(test_trickle_1_wait_long),
-#endif
 			ztest_unit_test(test_trickle_stop),
 			ztest_unit_test(test_trickle_1_stopped));
 	ztest_run_test_suite(test_tickle);

Original file line number	Diff line number	Diff line change
`@@ -803,4 +803,9 @@ void test_pipe_get_invalid_size(void)`
`803`	`803`
`804`	`804`	`zassert_unreachable("fault didn't occur for min_xfer <= bytes_to_read");`
`805`	`805`	`}`
	`806`	`+#else`
	`807`	`+void test_pipe_get_invalid_size(void)`
	`808`	`+{`
	`809`	`+ ztest_test_skip();`
	`810`	`+}`
`806`	`811`	`#endif`