testing: add zephyr/ prefix to testing include path

Continuation of issue #41543 to add prefix scope for Zephyr's include
files.

Signed-off-by: Yuval Peress <peress@google.com>

cmake/modules/unittest.cmake

@@ -33,6 +33,7 @@ gen_kobj(KOBJ_GEN_DIR)
 
 list(APPEND INCLUDE
   subsys/testsuite/ztest/include/zephyr
+  subsys/testsuite/include/zephyr
   subsys/testsuite/ztest/include
   subsys/testsuite/include
   include/zephyr
@@ -63,7 +64,7 @@ target_compile_options(testbinary PRIVATE
   )
 
 target_link_options(testbinary PRIVATE
-  -T "${ZEPHYR_BASE}/subsys/testsuite/include/ztest_unittest.ld"
+  -T "${ZEPHYR_BASE}/subsys/testsuite/include/zephyr/ztest_unittest.ld"
   )
 
 target_link_libraries(testbinary PRIVATE

subsys/testsuite/CMakeLists.txt

@@ -2,9 +2,11 @@
 
 add_subdirectory_ifdef(CONFIG_ZTEST ztest)
 
-zephyr_include_directories_ifdef(CONFIG_TEST
-  ${ZEPHYR_BASE}/subsys/testsuite/include
-  )
+if(CONFIG_TEST)
+  zephyr_include_directories(${ZEPHYR_BASE}/subsys/testsuite/include)
+  zephyr_include_directories_ifdef(
+      CONFIG_LEGACY_INCLUDE_PATH ${ZEPHYR_BASE}/subsys/testsuite/include/zephyr)
+endif()
 add_subdirectory_ifdef(CONFIG_COVERAGE_GCOV coverage)
 
 zephyr_library_sources_ifdef(CONFIG_TEST_BUSY_SIM busy_sim/busy_sim.c)

subsys/testsuite/ztest/CMakeLists.txt

@@ -4,6 +4,10 @@ zephyr_include_directories(
   ${ZEPHYR_BASE}/subsys/testsuite/include
   ${ZEPHYR_BASE}/subsys/testsuite/ztest/include
   )
+zephyr_include_directories_ifdef(
+    CONFIG_LEGACY_INCLUDE_PATH ${ZEPHYR_BASE}/subsys/testsuite/include/zephyr)
+zephyr_include_directories_ifdef(
+    CONFIG_LEGACY_INCLUDE_PATH ${ZEPHYR_BASE}/subsys/testsuite/ztest/include/zephyr)
 
 if(DEFINED TC_RUNID)
   zephyr_compile_definitions(TC_RUNID=${TC_RUNID})

subsys/testsuite/ztest/src/ztest.c

@@ -4,8 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
 #include <stdio.h>
+
+
+#include <zephyr/ztest.h>
 #include <zephyr/app_memory/app_memdomain.h>
 #ifdef CONFIG_USERSPACE
 #include <zephyr/sys/libc-hooks.h>

subsys/testsuite/ztest/src/ztest_mock.c

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
 #include <zephyr/types.h>
+#include <zephyr/ztest.h>
 #include <string.h>
 #include <stdio.h>
 

tests/unit/base64/main.c

@@ -23,10 +23,9 @@
  */
 
 #include <string.h>
-#include <zephyr/types.h>
 #include <stdbool.h>
-#include <ztest.h>
 #include <zephyr/sys/base64.h>
+#include <zephyr/ztest.h>
 
 #include "../../../lib/os/base64.c"
 

tests/ztest/automain/src/test_feature.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /**
  * @brief A stub unit test.

tests/ztest/base/src/main.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_SUITE(framework_tests, NULL, NULL, NULL, NULL, NULL);
 

tests/ztest/base/src/main_deprecated.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 static void test_empty_test(void)
 {

tests/ztest/busy_sim/src/main.c

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
-#include <busy_sim.h>
+#include <zephyr/ztest.h>
+#include <zephyr/busy_sim.h>
 
 static void test_busy_sim(void)
 {

tests/ztest/custom_output/src/main.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 static void test_assert_pass(void)
 {

tests/ztest/mock/src/main.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 static void expect_one_parameter(int a)
 {

tests/ztest/mock_fff/src/main.c

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
-#include <fff.h>
+#include <zephyr/ztest.h>
+#include <zephyr/fff.h>
 
 #include <c_test_framework.h>