test: fix more legacy #include paths

Add a bunch of missing "zephyr/" prefixes to #include statements in
various test and test framework files.

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>

doc/develop/test/mocking.c

@@ -1,4 +1,4 @@
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 static void expect_two_parameters(int a, int b)
 {

modules/fff/include/c_test_framework.h

@@ -6,7 +6,7 @@
 #ifndef MODULES_FFF_TEST_INCLUDE_C_TEST_FRAMEWORK_H_
 #define MODULES_FFF_TEST_INCLUDE_C_TEST_FRAMEWORK_H_
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/printk.h>
 
 void setup(void);

samples/subsys/testsuite/integration/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);

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

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

subsys/testsuite/busy_sim/busy_sim.c

@@ -6,7 +6,7 @@
 #include <zephyr/drivers/entropy.h>
 #include <zephyr/drivers/counter.h>
 #include <zephyr/drivers/gpio.h>
-#include "busy_sim.h"
+#include <zephyr/busy_sim.h>
 #include <zephyr/sys/ring_buffer.h>
 #include <zephyr/random/rand32.h>
 

subsys/testsuite/include/zephyr/test_utils.h

@@ -32,7 +32,7 @@
 #ifndef __TEST_UTILS_H__
 #define __TEST_UTILS_H__
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 #include <tinycrypt/constants.h>
 
 static inline void show_str(const char *label, const uint8_t *s, size_t len)

subsys/testsuite/include/zephyr/timestamp.h

@@ -17,9 +17,9 @@
 
 #include <limits.h>
 #if defined(__GNUC__)
-#include <test_asm_inline_gcc.h>
+#include <zephyr/test_asm_inline_gcc.h>
 #else
-#include <test_asm_inline_other.h>
+#include <zephyr/test_asm_inline_other.h>
 #endif
 
 

subsys/testsuite/ztest/include/zephyr/ztest.h

@@ -58,10 +58,10 @@ typedef struct esf z_arch_esf_t;
 
 #include <zephyr/zephyr.h>
 
-#include <ztest_assert.h>
-#include <ztest_mock.h>
-#include <ztest_test.h>
-#include <tc_util.h>
+#include <zephyr/ztest_assert.h>
+#include <zephyr/ztest_mock.h>
+#include <zephyr/ztest_test.h>
+#include <zephyr/tc_util.h>
 
 #ifdef __cplusplus
 extern "C" {

subsys/testsuite/ztest/include/zephyr/ztest_assert.h

@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #ifdef __cplusplus
 extern "C" {

subsys/testsuite/ztest/include/zephyr/ztest_test.h

@@ -9,9 +9,9 @@
 #define ZEPHYR_TESTSUITE_INCLUDE_ZTEST_TEST_H_
 
 #ifdef CONFIG_ZTEST_NEW_API
-#include <ztest_test_new.h>
+#include <zephyr/ztest_test_new.h>
 #else
-#include <ztest_test_deprecated.h>
+#include <zephyr/ztest_test_deprecated.h>
 #endif /* !CONFIG_ZTEST_NEW_API */
 
 #ifdef __cplusplus

subsys/testsuite/ztest/src/ztest_defaults.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /**
  * @brief Try to shorten a filename by removing the current directory

subsys/testsuite/ztest/src/ztest_error_hook.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 
 #if defined(CONFIG_ZTEST_FATAL_HOOK)

subsys/testsuite/ztest/src/ztest_new.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/app_memory/app_memdomain.h>
 #ifdef CONFIG_USERSPACE

subsys/testsuite/ztest/src/ztest_posix.c

@@ -9,8 +9,8 @@
 #include <unistd.h>
 #include "cmdline.h" /* native_posix command line options header */
 #include "soc.h"
-#include "tc_util.h"
-#include "ztest_test_new.h"
+#include <zephyr/tc_util.h>
+#include <zephyr/ztest_test_new.h>
 
 static const char *test_args;
 static bool list_tests;

subsys/testsuite/ztest/src/ztest_rules.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #ifdef CONFIG_ZTEST_RULE_1CPU
 static void one_cpu_rule_before_each(const struct ztest_unit_test *test, void *data)

subsys/testsuite/ztest/src/ztress.c

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <ztress.h>
-#include <ztest_test.h>
+#include <zephyr/ztress.h>
+#include <zephyr/ztest_test.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/random/rand32.h>
 #include <string.h>

tests/application_development/code_relocation/src/main.c

@@ -7,7 +7,7 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /* This function will allow execute from sram region.
  * This is needed only for this sample because by default all soc will

tests/application_development/code_relocation/src/test_file1.c

@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <zephyr/sys/printk.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 uint32_t var_sram2_data = 10U;
 uint32_t var_sram2_bss;

tests/application_development/code_relocation/src/test_file2.c

@@ -7,7 +7,7 @@
 
 #include <zephyr/zephyr.h>
 #include <zephyr/sys/printk.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 void function_in_sram(int32_t value)
 {

tests/application_development/code_relocation/src/test_file3.c

@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <zephyr/sys/printk.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 uint32_t var_file3_sram_data = 10U;
 uint32_t var_file3_sram2_bss;

tests/application_development/gen_inc_file/src/main.c

@@ -6,7 +6,7 @@
 #include <string.h>
 #include <zephyr/types.h>
 #include <stdbool.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 /* Don't confuse doxygen with missing files */
 /**

tests/arch/arm/arm_hardfault_validation/src/arm_hardfault.c

@@ -8,8 +8,8 @@
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/reboot.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
-#include <ztest.h>
-#include <tc_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/tc_util.h>
 
 static volatile int expected_reason = -1;
 

tests/arch/arm/arm_hardfault_validation/src/main.c

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

tests/arch/arm/arm_interrupt/src/arm_interrupt.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 

tests/arch/arm/arm_interrupt/src/main.c

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

tests/arch/arm/arm_irq_advanced_features/src/arm_dynamic_direct_interrupts.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 

tests/arch/arm/arm_irq_advanced_features/src/arm_irq_target_state.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 

tests/arch/arm/arm_irq_advanced_features/src/arm_zero_latency_irqs.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 

tests/arch/arm/arm_irq_advanced_features/src/main.c

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

tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <zephyr/linker/sections.h>

tests/arch/arm/arm_irq_vector_table/src/main.c

@@ -8,6 +8,6 @@
   #error project can only run on Cortex-M
 #endif
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_SUITE(vector_table, NULL, NULL, NULL, NULL, NULL);

tests/arch/arm/arm_irq_zero_latency_levels/src/main.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 

tests/arch/arm/arm_mem_protect/src/main.c

@@ -5,7 +5,7 @@
 
 #include <zephyr/zephyr.h>
 #include <zephyr/syscall_handler.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_BMEM char user_stack[256];
 

tests/arch/arm/arm_ramfunc/src/arm_ramfunc.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/linker/linker-defs.h>
 #include <zephyr/syscall_handler.h>
 

tests/arch/arm/arm_ramfunc/src/main.c

@@ -8,6 +8,6 @@
   #error test can only run on Cortex-M MCUs
 #endif
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_SUITE(arm_ramfunc, NULL, NULL, NULL, NULL, NULL);

tests/arch/arm/arm_runtime_nmi/src/arm_runtime_nmi.c

@@ -8,8 +8,8 @@
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/reboot.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
-#include <ztest.h>
-#include <tc_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/tc_util.h>
 
 /* on v8m arch the nmi pend bit is renamed to pend nmi map it to old name */
 #ifndef SCB_ICSR_NMIPENDSET_Msk

tests/arch/arm/arm_runtime_nmi/src/main.c

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

tests/arch/arm/arm_sw_vector_relay/src/arm_sw_vector_relay.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/linker/linker-defs.h>
 #include <zephyr/syscall_handler.h>
 #include <zephyr/toolchain.h>

tests/arch/arm/arm_sw_vector_relay/src/main.c

@@ -8,6 +8,6 @@
   #error test can only run on Cortex-M MCUs
 #endif
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_SUITE(arm_sw_vector_relay, NULL, NULL, NULL, NULL, NULL);

tests/arch/arm/arm_thread_swap/src/arm_syscalls.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <zephyr/kernel_structs.h>

tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <zephyr/kernel_structs.h>

tests/arch/arm/arm_thread_swap/src/main.c

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

tests/arch/arm/arm_thread_swap_tz/src/main.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <psa/crypto.h>
 #include <zephyr/kernel.h>
 

tests/arch/arm/arm_tz_wrap_func/src/main.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <aarch32/cortex_m/tz_ns.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 

tests/arch/arm64/arm64_gicv3_its/src/main.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/interrupt_controller/gicv3_its.h>
 

tests/arch/arm64/arm64_high_addresses/src/main.c

@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 ZTEST_USER(arm64_high_addresses, test_arm64_high_addresses)
 {

tests/arch/arm64/arm64_psci/src/main.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/pm_cpu_ops/psci.h>
 #include <zephyr/drivers/pm_cpu_ops.h>
 

tests/arch/common/semihost/src/main.c

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/arch/common/semihost.h>
 
 ZTEST(semihost, test_file_ops)

tests/arch/x86/cpu_scrubs_regs/src/main.c

@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <zephyr/syscall_handler.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "test_syscalls.h"
 
 #define DB_VAL 0xDEADBEEF

tests/arch/x86/direct_isr/src/direct_isr.c

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
-#include "interrupt_util.h"
+#include <zephyr/ztest.h>
+#include <zephyr/interrupt_util.h>
 
 /*
  * Other arch has already been tested in testcase of gen_isr_table,

tests/arch/x86/nmi/src/main.c

@@ -5,8 +5,8 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
-#include <tc_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/tc_util.h>
 
 #include <kernel_internal.h>
 #if defined(__GNUC__)

tests/arch/x86/pagetables/src/main.c

@@ -10,8 +10,8 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
-#include <tc_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/tc_util.h>
 #include <zephyr/arch/x86/mmustructs.h>
 #include <x86_mmu.h>
 #include <zephyr/linker/linker-defs.h>

tests/arch/x86/static_idt/src/main.c

@@ -11,8 +11,8 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <ztest.h>
-#include <tc_util.h>
+#include <zephyr/ztest.h>
+#include <zephyr/tc_util.h>
 #include <zephyr/arch/x86/ia32/segmentation.h>
 
 #include <kernel_internal.h>

tests/benchmarks/app_kernel/src/master.c

@@ -14,7 +14,7 @@
  *		_R : Is a file that contains the receiver task
  *			 of a benchmark function
  */
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 #include "master.h"
 
 char msg[MAX_MSG];

tests/benchmarks/app_kernel/src/master.h

@@ -15,7 +15,7 @@
 
 #include "receiver.h"
 
-#include <timestamp.h>
+#include <zephyr/timestamp.h>
 
 #include <string.h>
 

tests/benchmarks/cmsis_dsp/basicmath/src/f32.c

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>

tests/benchmarks/cmsis_dsp/basicmath/src/q15.c

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>

tests/benchmarks/cmsis_dsp/basicmath/src/q31.c

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>

tests/benchmarks/cmsis_dsp/basicmath/src/q7.c

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>

tests/benchmarks/cmsis_dsp/common/benchmark_common.h

@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_BENCHMARK_CMSIS_DSP_COMMON_BENCHMARK_COMMON_H_
 #define ZEPHYR_BENCHMARK_CMSIS_DSP_COMMON_BENCHMARK_COMMON_H_
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/zephyr.h>
 
 #if defined(CONFIG_CPU_CORTEX_M_HAS_DWT)

tests/benchmarks/data_structure_perf/dlist_perf/src/dlist_perf.c

@@ -10,7 +10,7 @@
  * @defgroup lib_dlist_tests Dlist
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/dlist.h>
 
 #define NODE_SIZE 5

tests/benchmarks/data_structure_perf/rbtree_perf/src/rbtree_perf.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <zephyr/sys/rb.h>
 
 #define TREE_SIZE 512

tests/benchmarks/latency_measure/src/main.c

@@ -9,9 +9,9 @@
  * This file contains the main testing module that invokes all the tests.
  */
 
-#include <timestamp.h>
+#include <zephyr/timestamp.h>
 #include "utils.h"
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 
 #define STACK_SIZE (1024 + CONFIG_TEST_EXTRA_STACK_SIZE)
 

tests/benchmarks/latency_measure/src/thread_switch_yield.c

@@ -14,7 +14,7 @@
 #include <zephyr/zephyr.h>
 #include <zephyr/timing/timing.h>
 #include <stdlib.h>
-#include "timestamp.h"
+#include <zephyr/timestamp.h>
 #include "utils.h" /* PRINT () and other macros */
 
 /* context switch enough time so our measurement is precise */

tests/benchmarks/latency_measure/src/utils.h

@@ -14,7 +14,7 @@
 #include <zephyr/timing/timing.h>
 #include <zephyr/sys/printk.h>
 #include <stdio.h>
-#include "timestamp.h"
+#include <zephyr/timestamp.h>
 
 #define INT_IMM8_OFFSET   1
 #define IRQ_PRIORITY      3

tests/benchmarks/sys_kernel/src/syskernel.c

@@ -7,7 +7,7 @@
  */
 
 #include <zephyr/zephyr.h>
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 
 #include "syskernel.h"
 

tests/benchmarks/sys_kernel/src/syskernel.h

@@ -9,7 +9,7 @@
 #ifndef SYSKERNEK_H
 #define SYSKERNEK_H
 
-#include <timestamp.h>
+#include <zephyr/timestamp.h>
 
 #include <stdio.h>
 #include <zephyr/toolchain.h>

tests/bluetooth/adv/src/main.c

@@ -8,7 +8,7 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define DEVICE_NAME CONFIG_BT_DEVICE_NAME
 #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1)

tests/bluetooth/at/src/main.c

@@ -12,7 +12,7 @@
 
 #include "subsys/bluetooth/host/at.h"
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 static struct at_client at;
 static char buffer[140];

tests/bluetooth/bluetooth/src/bluetooth.c

@@ -9,8 +9,8 @@
 #include <zephyr/zephyr.h>
 
 #include <errno.h>
-#include <tc_util.h>
-#include <ztest.h>
+#include <zephyr/tc_util.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/drivers/bluetooth/hci_driver.h>

tests/bluetooth/controller/ctrl_api/src/main.c

@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #include <zephyr/bluetooth/hci.h>

tests/bluetooth/controller/ctrl_chmu/src/main.c

@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #define ULL_LLCP_UNITTEST

tests/bluetooth/controller/ctrl_cis_create/src/main.c

@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #include <zephyr/bluetooth/hci.h>

tests/bluetooth/controller/ctrl_cis_terminate/src/main.c

@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #include <zephyr/bluetooth/hci.h>

tests/bluetooth/controller/ctrl_collision/src/main.c

@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #define ULL_LLCP_UNITTEST

tests/bluetooth/controller/ctrl_conn_update/src/main.c

@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define ULL_LLCP_UNITTEST
 

tests/bluetooth/controller/ctrl_cte_req/src/main.c

@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #include <zephyr/bluetooth/hci.h>

tests/bluetooth/controller/ctrl_data_length_update/src/main.c

@@ -6,7 +6,7 @@
 
 #include <zephyr/types.h>
 #include <zephyr/sys/byteorder.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #define ULL_LLCP_UNITTEST
 

tests/bluetooth/controller/ctrl_encrypt/src/main.c

@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #define ULL_LLCP_UNITTEST

tests/bluetooth/controller/ctrl_feature_exchange/src/main.c

@@ -6,7 +6,7 @@
 
 #include <zephyr/types.h>
 #include <zephyr/sys/byteorder.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #define ULL_LLCP_UNITTEST

tests/bluetooth/controller/ctrl_feature_exchange/src/main_hci.c

@@ -6,7 +6,7 @@
 
 #include <zephyr/types.h>
 #include <zephyr/sys/byteorder.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #define ULL_LLCP_UNITTEST

tests/bluetooth/controller/ctrl_hci/src/main.c

@@ -6,7 +6,7 @@
 
 #include <zephyr/types.h>
 #include <zephyr/sys/byteorder.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #define ULL_LLCP_UNITTEST

tests/bluetooth/controller/ctrl_invalid/src/main.c

@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/sys/byteorder.h>

tests/bluetooth/controller/ctrl_le_ping/src/main.c

@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #include <zephyr/bluetooth/hci.h>

tests/bluetooth/controller/ctrl_min_used_chans/src/main.c

@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #include <zephyr/bluetooth/hci.h>

tests/bluetooth/controller/ctrl_phy_update/src/main.c

@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #define ULL_LLCP_UNITTEST

tests/bluetooth/controller/ctrl_terminate/src/main.c

@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #include <zephyr/bluetooth/hci.h>

tests/bluetooth/controller/ctrl_tx_buffer_alloc/src/main.c

@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #define ULL_LLCP_UNITTEST

tests/bluetooth/controller/ctrl_tx_queue/src/main.c

@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <stdio.h>
 #include <stdlib.h>

tests/bluetooth/controller/ctrl_unsupported/src/main.c

@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/sys/byteorder.h>

tests/bluetooth/controller/ctrl_version/src/main.c

@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #include <zephyr/bluetooth/hci.h>

tests/bluetooth/controller/mock_ctrl/src/kernel.c

@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 bool k_is_in_isr(void)
 {

tests/bluetooth/controller/mock_ctrl/src/ll.c

@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #include <zephyr/bluetooth/hci.h>

tests/bluetooth/controller/mock_ctrl/src/lll.c

@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "kconfig.h"
 
 #include <zephyr/bluetooth/hci.h>

tests/bluetooth/ctrl_isoal/src/main.c

@@ -11,8 +11,8 @@
 
 #include <string.h>
 #include <zephyr/types.h>
-#include <ztest.h>
-#include <ztest_error_hook.h>
+#include <zephyr/ztest.h>
+#include <zephyr/ztest_error_hook.h>
 
 #include <stdio.h>
 #include <stdlib.h>

tests/bluetooth/ctrl_sw_privacy/src/main.c

@@ -9,7 +9,7 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <zephyr/sys/printk.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 

tests/bluetooth/ctrl_sw_privacy_unit/src/main.c

@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include <zephyr/types.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <stdio.h>
 #include <stdlib.h>

tests/bluetooth/ctrl_user_ext/src/main.c

@@ -9,7 +9,7 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <zephyr/sys/printk.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 

tests/bluetooth/df/common/src/bt_common.c

@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <stddef.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 

tests/bluetooth/df/common/src/bt_conn_common.c

@@ -6,7 +6,7 @@
 
 #include <zephyr/zephyr.h>
 #include <stddef.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 
 #include <util/util.h>
 #include <util/memq.h>