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>

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>