Bluetooth tests

include/linker/common-ram.ld

@@ -143,4 +143,6 @@
 
 #if defined(CONFIG_ZTEST)
 	ITERABLE_SECTION_RAM(ztest_suite_node, 4)
+	ITERABLE_SECTION_RAM(ztest_unit_test, 4)
+	ITERABLE_SECTION_RAM(ztest_test_rule, 4)
 #endif /* CONFIG_ZTEST */

samples/subsys/testsuite/integration/src/main.c

@@ -6,13 +6,16 @@
 
 #include <ztest.h>
 
+
+ZTEST_SUITE(framework_tests, NULL, NULL, NULL, NULL, NULL);
+
 /**
  * @brief Test Asserts
  *
  * This test verifies various assert macros provided by ztest.
  *
  */
-static void test_assert(void)
+ZTEST(framework_tests, test_assert)
 {
 	zassert_true(1, "1 was false");
 	zassert_false(0, "0 was true");
@@ -21,12 +24,3 @@ static void test_assert(void)
 	zassert_equal(1, 1, "1 was not equal to 1");
 	zassert_equal_ptr(NULL, NULL, "NULL was not equal to NULL");
 }
-
-void test_main(void)
-{
-	ztest_test_suite(framework_tests,
-		ztest_unit_test(test_assert)
-	);
-
-	ztest_run_test_suite(framework_tests);
-}

samples/subsys/testsuite/pytest/src/main.c

@@ -4,16 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <ztest.h>
-void test_pytest(void)
-{
-	TC_PRINT("Hello world\n");
-}
 
-void test_main(void)
-{
-	ztest_test_suite(test_pytest,
-			 ztest_unit_test(test_pytest)
-			 );
+ZTEST_SUITE(test_pytest, NULL, NULL, NULL, NULL, NULL);
 
-	ztest_run_test_suite(test_pytest);
+ZTEST(test_pytest, test_pytest)
+{
+	TC_PRINT("Hello world\n");
 }

subsys/bluetooth/controller/ll_sw/ull_chan.c

@@ -23,6 +23,7 @@
 #include "lll/lll_adv_types.h"
 #include "lll_adv.h"
 #include "lll/lll_adv_pdu.h"
+#include "lll/lll_df_types.h"
 #include "lll_conn.h"
 
 #include "ull_adv_types.h"

subsys/testsuite/include/ztest.ld

@@ -12,5 +12,17 @@ SECTIONS
 		KEEP(*(SORT_BY_NAME(._ztest_suite_node.static.*)))
 		_ztest_suite_node_list_end = .;
 	}
+	.data.ztest_unit_test_area : ALIGN(4)
+	{
+		_ztest_unit_test_list_start = .;
+		KEEP(*(SORT_BY_NAME(._ztest_unit_test.static.*)))
+		_ztest_unit_test_list_end = .;
+	}
+	.data.ztest_test_rule_area : ALIGN(4)
+	{
+		_ztest_test_rule_list_start = .;
+		KEEP(*(SORT_BY_NAME(._ztest_test_rule.static.*)))
+		_ztest_test_rule_list_end = .;
+	}
 }
 INSERT AFTER .data;

subsys/testsuite/ztest/CMakeLists.txt

@@ -8,4 +8,5 @@ zephyr_include_directories(
 zephyr_library()
 zephyr_library_sources(                           src/ztest.c)
 zephyr_library_sources(                           src/ztest_error_hook.c)
+zephyr_library_sources(                           src/ztest_rules.c)
 zephyr_library_sources_ifdef(CONFIG_ZTEST_MOCKING src/ztest_mock.c)

subsys/testsuite/ztest/Kconfig

@@ -73,6 +73,16 @@ config ZTEST_ASSERT_HOOK
 	  error test case. Remember to add ignore_fault tag in yaml file when
 	  using twister to run testing.
 
+menu "ztest provided rules"
+
+config ZTEST_RULE_1CPU
+	bool "Run all the tests on a single CPU"
+	help
+	  This rule will call z_test_1cpu_start before each unit test and
+	  ztest_1cpu_stop after each test.
+
+endmenu
+
 endif # ZTEST
 
 config ZTEST_MOCKING