Skip to content

Commit ade7ccb

Browse files
gmarullcarlescufi
gmarull
authored and
carlescufi
committed
tests: migrate includes to <zephyr/...>
In order to bring consistency in-tree, migrate all tests to the new prefix <zephyr/...>. Note that the conversion has been scripted, refer to #45388 for more details. Signed-off-by: Gerard Marull-Paretas <[email protected]>
1 parent fb60aab commit ade7ccb

File tree

824 files changed

+2214
-2214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

824 files changed

+2214
-2214
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <zephyr.h>
8-
#include <sys/printk.h>
9-
#include <sys/reboot.h>
10-
#include <arch/arm/aarch32/cortex_m/cmsis.h>
7+
#include <zephyr/zephyr.h>
8+
#include <zephyr/sys/printk.h>
9+
#include <zephyr/sys/reboot.h>
10+
#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
1111
#include <ztest.h>
1212
#include <tc_util.h>
1313

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66

77
#include <ztest.h>
8-
#include <arch/cpu.h>
9-
#include <arch/arm/aarch32/cortex_m/cmsis.h>
8+
#include <zephyr/arch/cpu.h>
9+
#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
1010

1111
static volatile int test_flag;
1212
static volatile int expected_reason = -1;
@@ -377,7 +377,7 @@ void test_arm_interrupt(void)
377377
}
378378

379379
#if defined(CONFIG_USERSPACE)
380-
#include <syscall_handler.h>
380+
#include <zephyr/syscall_handler.h>
381381
#include "test_syscalls.h"
382382

383383
void z_impl_test_arm_user_interrupt_syscall(void)

‎tests/arch/arm/arm_interrupt/src/test_syscalls.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#ifndef _TEST_SYSCALLS_H_
88
#define _TEST_SYSCALLS_H_
9-
#include <zephyr.h>
9+
#include <zephyr/zephyr.h>
1010

1111
__syscall void test_arm_user_interrupt_syscall(void);
1212

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66

77
#include <ztest.h>
8-
#include <arch/cpu.h>
9-
#include <arch/arm/aarch32/cortex_m/cmsis.h>
8+
#include <zephyr/arch/cpu.h>
9+
#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
1010

1111
/* Offset for the Direct interrupt used in this test. */
1212
#define DIRECT_ISR_OFFSET (CONFIG_NUM_IRQS - 1)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66

77
#include <ztest.h>
8-
#include <arch/cpu.h>
9-
#include <arch/arm/aarch32/cortex_m/cmsis.h>
8+
#include <zephyr/arch/cpu.h>
9+
#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
1010

1111
#if defined(CONFIG_ARM_SECURE_FIRMWARE) && \
1212
defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66

77
#include <ztest.h>
8-
#include <arch/cpu.h>
9-
#include <arch/arm/aarch32/cortex_m/cmsis.h>
8+
#include <zephyr/arch/cpu.h>
9+
#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
1010

1111
static volatile int test_flag;
1212

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
*/
66

77
#include <ztest.h>
8-
#include <arch/cpu.h>
9-
#include <arch/arm/aarch32/cortex_m/cmsis.h>
10-
#include <linker/sections.h>
8+
#include <zephyr/arch/cpu.h>
9+
#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
10+
#include <zephyr/linker/sections.h>
1111

1212

1313
/*

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* Copyright (c) 2021 Lexmark International, Inc.
44
*/
55

6-
#include <zephyr.h>
7-
#include <syscall_handler.h>
6+
#include <zephyr/zephyr.h>
7+
#include <zephyr/syscall_handler.h>
88
#include <ztest.h>
99

1010
ZTEST_BMEM char user_stack[256];

‎tests/arch/arm/arm_no_multithreading/src/main.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <kernel.h>
8-
#include <sys/printk.h>
9-
#include <sys/__assert.h>
10-
#include <arch/arm/aarch32/cortex_m/cmsis.h>
7+
#include <zephyr/kernel.h>
8+
#include <zephyr/sys/printk.h>
9+
#include <zephyr/sys/__assert.h>
10+
#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
1111

1212
#if !defined(CONFIG_CPU_CORTEX_M)
1313
#error test can only run on Cortex-M MCUs

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66

77
#include <ztest.h>
8-
#include <linker/linker-defs.h>
9-
#include <syscall_handler.h>
8+
#include <zephyr/linker/linker-defs.h>
9+
#include <zephyr/syscall_handler.h>
1010

1111
static volatile int test_flag;
1212

0 commit comments

Comments
 (0)