diff options
author | Fabio Baltieri <fabiobaltieri@google.com> | 2022-08-04 07:57:41 +0000 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-08-04 20:52:50 +0000 |
commit | 0096058366ada3cfbaf8aa3c1ffcca99d984f263 (patch) | |
tree | 07c9198558668db7bad4383d7514df86be768217 | |
parent | d16be8f98d81d7e589935d1c6c78ec4430a8960d (diff) | |
download | chrome-ec-0096058366ada3cfbaf8aa3c1ffcca99d984f263.tar.gz |
zephyr: shim: add all missing include/ prefixes
Add all the missing include/ prefixes to the various #include around the
zephyr tests so that they build with LEGACY_INCLUDE_PATH=n.
BRANCH=none
BUG=none
TEST=zmake testall
Cq-Depend: chromium:3807663
Change-Id: I81cea4f291eea61e674ef2fa61bdc60407c5f142
Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3810411
Reviewed-by: Keith Short <keithshort@chromium.org>
92 files changed, 108 insertions, 108 deletions
diff --git a/include/test_util.h b/include/test_util.h index 66513f6513..c128611ae5 100644 --- a/include/test_util.h +++ b/include/test_util.h @@ -13,7 +13,7 @@ #include "stack_trace.h" #ifdef CONFIG_ZTEST -#include <ztest.h> +#include <zephyr/ztest.h> #include "ec_tasks.h" #endif /* CONFIG_ZTEST */ diff --git a/zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c b/zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c index 81d96c4328..88fd96c9d2 100644 --- a/zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c +++ b/zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c @@ -5,8 +5,8 @@ #include <soc_espi.h> #include <ap_power/ap_power.h> #include <chipset.h> -#include <devicetree.h> -#include <logging/log.h> +#include <zephyr/devicetree.h> +#include <zephyr/logging/log.h> LOG_MODULE_REGISTER(ec_chip_it8xxx2_espi, CONFIG_ESPI_LOG_LEVEL); diff --git a/zephyr/emul/emul_isl923x.c b/zephyr/emul/emul_isl923x.c index 2a0a903dc1..1822c7b268 100644 --- a/zephyr/emul/emul_isl923x.c +++ b/zephyr/emul/emul_isl923x.c @@ -11,7 +11,7 @@ #include <zephyr/drivers/emul.h> #include <errno.h> #include <zephyr/sys/__assert.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "driver/charger/isl923x.h" #include "driver/charger/isl923x_public.h" diff --git a/zephyr/emul/emul_syv682x.c b/zephyr/emul/emul_syv682x.c index 5ce82dfb24..7c289cb1ea 100644 --- a/zephyr/emul/emul_syv682x.c +++ b/zephyr/emul/emul_syv682x.c @@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(syv682x); #include <stdint.h> #include <string.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "emul/emul_common_i2c.h" #include "emul/emul_syv682x.h" diff --git a/zephyr/emul/emul_tcs3400.c b/zephyr/emul/emul_tcs3400.c index 34f6954f85..cc376701d8 100644 --- a/zephyr/emul/emul_tcs3400.c +++ b/zephyr/emul/emul_tcs3400.c @@ -13,7 +13,7 @@ LOG_MODULE_REGISTER(emul_tcs); #include <zephyr/drivers/emul.h> #include <zephyr/drivers/i2c.h> #include <zephyr/drivers/i2c_emul.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "emul/emul_common_i2c.h" #include "emul/emul_tcs3400.h" diff --git a/zephyr/emul/tcpc/emul_ps8xxx.c b/zephyr/emul/tcpc/emul_ps8xxx.c index 8b15967e90..f6ce320476 100644 --- a/zephyr/emul/tcpc/emul_ps8xxx.c +++ b/zephyr/emul/tcpc/emul_ps8xxx.c @@ -12,7 +12,7 @@ LOG_MODULE_REGISTER(ps8xxx_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL); #include <zephyr/drivers/emul.h> #include <zephyr/drivers/i2c.h> #include <zephyr/drivers/i2c_emul.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "tcpm/tcpci.h" diff --git a/zephyr/emul/tcpc/emul_tcpci.c b/zephyr/emul/tcpc/emul_tcpci.c index f97af97970..14f920c97e 100644 --- a/zephyr/emul/tcpc/emul_tcpci.c +++ b/zephyr/emul/tcpc/emul_tcpci.c @@ -12,7 +12,7 @@ LOG_MODULE_REGISTER(tcpci_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL); #include <zephyr/drivers/i2c_emul.h> #include <zephyr/drivers/gpio/gpio_emul.h> #include <zephyr/sys/byteorder.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "tcpm/tcpci.h" diff --git a/zephyr/emul/tcpc/emul_tcpci_generic.c b/zephyr/emul/tcpc/emul_tcpci_generic.c index f851cc9978..50cf0e7eee 100644 --- a/zephyr/emul/tcpc/emul_tcpci_generic.c +++ b/zephyr/emul/tcpc/emul_tcpci_generic.c @@ -12,7 +12,7 @@ LOG_MODULE_REGISTER(tcpci_generic_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL); #include <zephyr/drivers/emul.h> #include <zephyr/drivers/i2c.h> #include <zephyr/drivers/i2c_emul.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "tcpm/tcpci.h" #include "emul/emul_stub_device.h" diff --git a/zephyr/emul/tcpc/emul_tcpci_partner_common.c b/zephyr/emul/tcpc/emul_tcpci_partner_common.c index 5f4b6c81a8..5ad4d9dcb8 100644 --- a/zephyr/emul/tcpc/emul_tcpci_partner_common.c +++ b/zephyr/emul/tcpc/emul_tcpci_partner_common.c @@ -9,7 +9,7 @@ LOG_MODULE_REGISTER(tcpci_partner, CONFIG_TCPCI_EMUL_LOG_LEVEL); #include <stdlib.h> #include <zephyr/sys/byteorder.h> #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "common.h" #include "emul/tcpc/emul_tcpci_partner_common.h" diff --git a/zephyr/shim/src/tasks.c b/zephyr/shim/src/tasks.c index 3225bdb196..b304696c83 100644 --- a/zephyr/shim/src/tasks.c +++ b/zephyr/shim/src/tasks.c @@ -295,7 +295,7 @@ void set_test_runner_tid(void) } #ifdef CONFIG_TASKS_SET_TEST_RUNNER_TID_RULE -#include <ztest.h> +#include <zephyr/ztest.h> static void set_test_runner_tid_rule_before(const struct ztest_unit_test *test, void *data) { diff --git a/zephyr/test/ap_power/src/board.c b/zephyr/test/ap_power/src/board.c index 96b30d21d3..68673f1772 100644 --- a/zephyr/test/ap_power/src/board.c +++ b/zephyr/test/ap_power/src/board.c @@ -4,7 +4,7 @@ */ #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include <ap_power_override_functions.h> #include <ap_power/ap_power_interface.h> diff --git a/zephyr/test/ap_power/src/events.c b/zephyr/test/ap_power/src/events.c index b464ce4fb2..6119c4be7e 100644 --- a/zephyr/test/ap_power/src/events.c +++ b/zephyr/test/ap_power/src/events.c @@ -14,7 +14,7 @@ #include <zephyr/drivers/espi_emul.h> #include <zephyr/logging/log.h> #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "ap_power/ap_power.h" #include "ap_power/ap_power_events.h" diff --git a/zephyr/test/ap_power/src/main.c b/zephyr/test/ap_power/src/main.c index 761fcfd997..015df61387 100644 --- a/zephyr/test/ap_power/src/main.c +++ b/zephyr/test/ap_power/src/main.c @@ -4,7 +4,7 @@ */ #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "ec_app_main.h" #include "test_state.h" diff --git a/zephyr/test/ap_power/src/signals.c b/zephyr/test/ap_power/src/signals.c index 8798483a19..00e0c9f0ab 100644 --- a/zephyr/test/ap_power/src/signals.c +++ b/zephyr/test/ap_power/src/signals.c @@ -15,7 +15,7 @@ #include <zephyr/drivers/gpio/gpio_emul.h> #include <zephyr/logging/log.h> #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "power_signals.h" diff --git a/zephyr/test/crc/main.c b/zephyr/test/crc/main.c index 0fc5eb63bb..709f270397 100644 --- a/zephyr/test/crc/main.c +++ b/zephyr/test/crc/main.c @@ -3,8 +3,8 @@ * found in the LICENSE file. */ -#include <ztest_assert.h> -#include <ztest_test_new.h> +#include <zephyr/ztest_assert.h> +#include <zephyr/ztest_test_new.h> #include "crc8.h" diff --git a/zephyr/test/drivers/chargesplash/src/chargesplash.c b/zephyr/test/drivers/chargesplash/src/chargesplash.c index 49092f6f31..28f87aaadf 100644 --- a/zephyr/test/drivers/chargesplash/src/chargesplash.c +++ b/zephyr/test/drivers/chargesplash/src/chargesplash.c @@ -9,7 +9,7 @@ #include <zephyr/shell/shell.h> #include <zephyr/shell/shell_uart.h> #include <zephyr/sys/__assert.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "chipset.h" #include "config.h" diff --git a/zephyr/test/drivers/common/include/test/drivers/stubs.h b/zephyr/test/drivers/common/include/test/drivers/stubs.h index 2e03142d72..ef9bb226c4 100644 --- a/zephyr/test/drivers/common/include/test/drivers/stubs.h +++ b/zephyr/test/drivers/common/include/test/drivers/stubs.h @@ -6,7 +6,7 @@ #ifndef __TEST_DRIVERS_STUBS_H #define __TEST_DRIVERS_STUBS_H -#include "fff.h" +#include <zephyr/fff.h> #include "power.h" enum usbc_port { USBC_PORT_C0 = 0, USBC_PORT_C1, USBC_PORT_COUNT }; diff --git a/zephyr/test/drivers/common/include/test/drivers/test_mocks.h b/zephyr/test/drivers/common/include/test/drivers/test_mocks.h index 815d8c3740..4db0102e1d 100644 --- a/zephyr/test/drivers/common/include/test/drivers/test_mocks.h +++ b/zephyr/test/drivers/common/include/test/drivers/test_mocks.h @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <fff.h> +#include <zephyr/fff.h> /* * Convenience macros diff --git a/zephyr/test/drivers/common/src/main.c b/zephyr/test/drivers/common/src/main.c index d044e79763..05f412682b 100644 --- a/zephyr/test/drivers/common/src/main.c +++ b/zephyr/test/drivers/common/src/main.c @@ -4,7 +4,7 @@ */ #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "ec_app_main.h" #include "test/drivers/test_state.h" diff --git a/zephyr/test/drivers/common/src/stubs.c b/zephyr/test/drivers/common/src/stubs.c index bc6c526108..2214894cfc 100644 --- a/zephyr/test/drivers/common/src/stubs.c +++ b/zephyr/test/drivers/common/src/stubs.c @@ -11,7 +11,7 @@ #include "charger/isl923x_public.h" #include "charger/isl9241_public.h" #include "config.h" -#include "fff.h" +#include <zephyr/fff.h> #include "gpio/gpio_int.h" #include "hooks.h" #include "i2c/i2c.h" diff --git a/zephyr/test/drivers/common/src/test_mocks.c b/zephyr/test/drivers/common/src/test_mocks.c index f8bbb1a6c1..3c8f31b9f2 100644 --- a/zephyr/test/drivers/common/src/test_mocks.c +++ b/zephyr/test/drivers/common/src/test_mocks.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <ztest.h> +#include <zephyr/ztest.h> #include "test/drivers/test_mocks.h" diff --git a/zephyr/test/drivers/common/src/test_rules.c b/zephyr/test/drivers/common/src/test_rules.c index 5125f50d58..8512f6abe9 100644 --- a/zephyr/test/drivers/common/src/test_rules.c +++ b/zephyr/test/drivers/common/src/test_rules.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <ztest.h> +#include <zephyr/ztest.h> #include "emul/tcpc/emul_tcpci.h" #include "motion_sense_fifo.h" diff --git a/zephyr/test/drivers/common/src/utils.c b/zephyr/test/drivers/common/src/utils.c index 8e810d49ac..1ea83827c4 100644 --- a/zephyr/test/drivers/common/src/utils.c +++ b/zephyr/test/drivers/common/src/utils.c @@ -6,7 +6,7 @@ #include <zephyr/drivers/gpio/gpio_emul.h> #include <zephyr/shell/shell_uart.h> #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "battery.h" #include "battery_smart.h" diff --git a/zephyr/test/drivers/default/src/battery.c b/zephyr/test/drivers/default/src/battery.c index 00c6664b12..71fe4798d2 100644 --- a/zephyr/test/drivers/default/src/battery.c +++ b/zephyr/test/drivers/default/src/battery.c @@ -4,7 +4,7 @@ */ #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include <zephyr/drivers/gpio.h> #include <zephyr/drivers/gpio/gpio_emul.h> diff --git a/zephyr/test/drivers/default/src/bb_retimer.c b/zephyr/test/drivers/default/src/bb_retimer.c index 1eb428ad84..596aa01c3a 100644 --- a/zephyr/test/drivers/default/src/bb_retimer.c +++ b/zephyr/test/drivers/default/src/bb_retimer.c @@ -4,7 +4,7 @@ */ #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include <zephyr/drivers/gpio.h> #include <zephyr/drivers/gpio/gpio_emul.h> diff --git a/zephyr/test/drivers/default/src/bc12.c b/zephyr/test/drivers/default/src/bc12.c index 4b233dd3e7..08ba790a04 100644 --- a/zephyr/test/drivers/default/src/bc12.c +++ b/zephyr/test/drivers/default/src/bc12.c @@ -4,7 +4,7 @@ */ #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include <zephyr/drivers/gpio.h> #include <zephyr/drivers/gpio/gpio_emul.h> diff --git a/zephyr/test/drivers/default/src/bma2x2.c b/zephyr/test/drivers/default/src/bma2x2.c index becacf5266..3a6dd7f5c3 100644 --- a/zephyr/test/drivers/default/src/bma2x2.c +++ b/zephyr/test/drivers/default/src/bma2x2.c @@ -4,7 +4,7 @@ */ #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "common.h" #include "i2c.h" diff --git a/zephyr/test/drivers/default/src/bmi160.c b/zephyr/test/drivers/default/src/bmi160.c index fc6f2c824e..3f42146654 100644 --- a/zephyr/test/drivers/default/src/bmi160.c +++ b/zephyr/test/drivers/default/src/bmi160.c @@ -4,7 +4,7 @@ */ #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "common.h" #include "i2c.h" diff --git a/zephyr/test/drivers/default/src/bmi260.c b/zephyr/test/drivers/default/src/bmi260.c index 059c0fc51a..7263ca2f5c 100644 --- a/zephyr/test/drivers/default/src/bmi260.c +++ b/zephyr/test/drivers/default/src/bmi260.c @@ -3,9 +3,9 @@ * found in the LICENSE file. */ -#include <fff.h> +#include <zephyr/fff.h> #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "common.h" #include "i2c.h" diff --git a/zephyr/test/drivers/default/src/charge_manager.c b/zephyr/test/drivers/default/src/charge_manager.c index 13668924fd..9640915058 100644 --- a/zephyr/test/drivers/default/src/charge_manager.c +++ b/zephyr/test/drivers/default/src/charge_manager.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <ztest.h> +#include <zephyr/ztest.h> #include "charge_manager.h" #include "ec_commands.h" diff --git a/zephyr/test/drivers/default/src/console_cmd/accelinfo.c b/zephyr/test/drivers/default/src/console_cmd/accelinfo.c index e60d00b596..e4e6343b5f 100644 --- a/zephyr/test/drivers/default/src/console_cmd/accelinfo.c +++ b/zephyr/test/drivers/default/src/console_cmd/accelinfo.c @@ -4,7 +4,7 @@ */ #include <zephyr/shell/shell.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "config.h" #include "console.h" diff --git a/zephyr/test/drivers/default/src/console_cmd/accelinit.c b/zephyr/test/drivers/default/src/console_cmd/accelinit.c index f6e2a4ae38..964a84aee0 100644 --- a/zephyr/test/drivers/default/src/console_cmd/accelinit.c +++ b/zephyr/test/drivers/default/src/console_cmd/accelinit.c @@ -3,9 +3,9 @@ * found in the LICENSE file. */ -#include <fff.h> +#include <zephyr/fff.h> #include <zephyr/shell/shell.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "accelgyro.h" #include "console.h" diff --git a/zephyr/test/drivers/default/src/console_cmd/accelrange.c b/zephyr/test/drivers/default/src/console_cmd/accelrange.c index 5aef4d7937..3432a2f7e0 100644 --- a/zephyr/test/drivers/default/src/console_cmd/accelrange.c +++ b/zephyr/test/drivers/default/src/console_cmd/accelrange.c @@ -5,7 +5,7 @@ #include <zephyr/shell/shell.h> #include <zephyr/devicetree.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "console.h" #include "driver/accel_bma2x2.h" diff --git a/zephyr/test/drivers/default/src/console_cmd/accelrate.c b/zephyr/test/drivers/default/src/console_cmd/accelrate.c index 6ae4b96343..73030a758e 100644 --- a/zephyr/test/drivers/default/src/console_cmd/accelrate.c +++ b/zephyr/test/drivers/default/src/console_cmd/accelrate.c @@ -4,7 +4,7 @@ */ #include <zephyr/shell/shell.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "console.h" #include "ec_commands.h" diff --git a/zephyr/test/drivers/default/src/console_cmd/accelread.c b/zephyr/test/drivers/default/src/console_cmd/accelread.c index 1dcc4168a4..77a2faa4e8 100644 --- a/zephyr/test/drivers/default/src/console_cmd/accelread.c +++ b/zephyr/test/drivers/default/src/console_cmd/accelread.c @@ -3,9 +3,9 @@ * found in the LICENSE file. */ -#include <fff.h> +#include <zephyr/fff.h> #include <zephyr/shell/shell.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "accelgyro.h" #include "console.h" diff --git a/zephyr/test/drivers/default/src/console_cmd/accelres.c b/zephyr/test/drivers/default/src/console_cmd/accelres.c index 62aebf51dd..71bc0793e0 100644 --- a/zephyr/test/drivers/default/src/console_cmd/accelres.c +++ b/zephyr/test/drivers/default/src/console_cmd/accelres.c @@ -3,9 +3,9 @@ * found in the LICENSE file. */ -#include <fff.h> +#include <zephyr/fff.h> #include <zephyr/shell/shell.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "accelgyro.h" #include "console.h" diff --git a/zephyr/test/drivers/default/src/console_cmd/accelspoof.c b/zephyr/test/drivers/default/src/console_cmd/accelspoof.c index 2d9887a2ab..3c51eb0bf1 100644 --- a/zephyr/test/drivers/default/src/console_cmd/accelspoof.c +++ b/zephyr/test/drivers/default/src/console_cmd/accelspoof.c @@ -4,7 +4,7 @@ */ #include <zephyr/shell/shell.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "console.h" #include "ec_commands.h" diff --git a/zephyr/test/drivers/default/src/console_cmd/charge_manager.c b/zephyr/test/drivers/default/src/console_cmd/charge_manager.c index c3b51f9a90..05b62b087d 100644 --- a/zephyr/test/drivers/default/src/console_cmd/charge_manager.c +++ b/zephyr/test/drivers/default/src/console_cmd/charge_manager.c @@ -4,7 +4,7 @@ */ #include <zephyr/shell/shell.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "charge_manager.h" #include "console.h" diff --git a/zephyr/test/drivers/default/src/console_cmd/charge_state.c b/zephyr/test/drivers/default/src/console_cmd/charge_state.c index 384e7d84e3..0edaee44c4 100644 --- a/zephyr/test/drivers/default/src/console_cmd/charge_state.c +++ b/zephyr/test/drivers/default/src/console_cmd/charge_state.c @@ -4,7 +4,7 @@ */ #include <zephyr/shell/shell.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "charge_state.h" #include "charge_state_v2.h" diff --git a/zephyr/test/drivers/default/src/console_cmd/usb_pd_console.c b/zephyr/test/drivers/default/src/console_cmd/usb_pd_console.c index 36f3402378..d4009e202d 100644 --- a/zephyr/test/drivers/default/src/console_cmd/usb_pd_console.c +++ b/zephyr/test/drivers/default/src/console_cmd/usb_pd_console.c @@ -4,7 +4,7 @@ */ #include <zephyr/shell/shell.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "console.h" #include "ec_commands.h" diff --git a/zephyr/test/drivers/default/src/cros_cbi.c b/zephyr/test/drivers/default/src/cros_cbi.c index d0afdaecdb..dc18243675 100644 --- a/zephyr/test/drivers/default/src/cros_cbi.c +++ b/zephyr/test/drivers/default/src/cros_cbi.c @@ -4,7 +4,7 @@ */ #include <zephyr/device.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "cros_cbi.h" #include "test/drivers/test_state.h" diff --git a/zephyr/test/drivers/default/src/gpio.c b/zephyr/test/drivers/default/src/gpio.c index 8686eee9c1..1d89b988f2 100644 --- a/zephyr/test/drivers/default/src/gpio.c +++ b/zephyr/test/drivers/default/src/gpio.c @@ -13,7 +13,7 @@ #include <zephyr/drivers/gpio/gpio_emul.h> #include <zephyr/logging/log.h> #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "common.h" #include "ec_tasks.h" diff --git a/zephyr/test/drivers/default/src/host_cmd/host_event_commands.c b/zephyr/test/drivers/default/src/host_cmd/host_event_commands.c index 8efcd6b302..8d02945a59 100644 --- a/zephyr/test/drivers/default/src/host_cmd/host_event_commands.c +++ b/zephyr/test/drivers/default/src/host_cmd/host_event_commands.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <ztest.h> +#include <zephyr/ztest.h> #include "include/lpc.h" #include "test/drivers/test_state.h" #include "test/drivers/utils.h" diff --git a/zephyr/test/drivers/default/src/host_cmd/motion_sense.c b/zephyr/test/drivers/default/src/host_cmd/motion_sense.c index 72d28b0824..f2b0cd1746 100644 --- a/zephyr/test/drivers/default/src/host_cmd/motion_sense.c +++ b/zephyr/test/drivers/default/src/host_cmd/motion_sense.c @@ -3,9 +3,9 @@ * found in the LICENSE file. */ -#include <fff.h> +#include <zephyr/fff.h> #include <zephyr/shell/shell.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "atomic.h" #include "console.h" diff --git a/zephyr/test/drivers/default/src/i2c_passthru.c b/zephyr/test/drivers/default/src/i2c_passthru.c index bab6a15b28..3011057f6d 100644 --- a/zephyr/test/drivers/default/src/i2c_passthru.c +++ b/zephyr/test/drivers/default/src/i2c_passthru.c @@ -4,7 +4,7 @@ */ #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "ec_commands.h" #include "host_command.h" diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb.c b/zephyr/test/drivers/default/src/integration/usbc/usb.c index 672ba6fb39..7bae453519 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb.c @@ -4,7 +4,7 @@ */ #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include <zephyr/drivers/gpio/gpio_emul.h> #include "battery_smart.h" diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c b/zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c index ba6da0bbf9..4716817f37 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <ztest.h> +#include <zephyr/ztest.h> #include "battery_smart.h" #include "emul/emul_isl923x.h" diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c b/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c index 5ef90594db..15e8a36fac 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c @@ -4,7 +4,7 @@ */ #include <stdint.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "battery_smart.h" #include "emul/emul_isl923x.h" diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_source.c b/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_source.c index d6beedeb1d..3e7c6577b2 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_source.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_source.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <ztest.h> +#include <zephyr/ztest.h> #include "battery_smart.h" #include "emul/emul_isl923x.h" diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_attach_src_snk.c b/zephyr/test/drivers/default/src/integration/usbc/usb_attach_src_snk.c index 5205952522..ff7e858009 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_attach_src_snk.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_attach_src_snk.c @@ -4,7 +4,7 @@ */ #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include <zephyr/drivers/gpio/gpio_emul.h> #include "ec_commands.h" diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c index 514aeef99b..cc30537bb7 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <ztest.h> +#include <zephyr/ztest.h> #include "emul/emul_isl923x.h" #include "emul/emul_smart_battery.h" diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_ctrl_msg.c b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_ctrl_msg.c index a68afd85d2..5b778e43f9 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_ctrl_msg.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_ctrl_msg.c @@ -4,7 +4,7 @@ */ #include <stdint.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "common.h" #include "ec_tasks.h" diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c index b18d443cab..18d0146d7e 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <ztest.h> +#include <zephyr/ztest.h> #include "battery.h" #include "battery_smart.h" diff --git a/zephyr/test/drivers/default/src/isl923x.c b/zephyr/test/drivers/default/src/isl923x.c index 45da3930b1..ccc65eca47 100644 --- a/zephyr/test/drivers/default/src/isl923x.c +++ b/zephyr/test/drivers/default/src/isl923x.c @@ -3,9 +3,9 @@ * found in the LICENSE file. */ -#include <ztest.h> +#include <zephyr/ztest.h> #include <zephyr/drivers/emul.h> -#include <fff.h> +#include <zephyr/fff.h> #include "battery.h" #include "battery_smart.h" diff --git a/zephyr/test/drivers/default/src/keyboard_scan.c b/zephyr/test/drivers/default/src/keyboard_scan.c index 7f1c860ad5..5125cf297a 100644 --- a/zephyr/test/drivers/default/src/keyboard_scan.c +++ b/zephyr/test/drivers/default/src/keyboard_scan.c @@ -2,7 +2,7 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ -#include <ztest.h> +#include <zephyr/ztest.h> #include <zephyr/drivers/emul.h> #include <zephyr/drivers/gpio.h> #include <zephyr/drivers/gpio/gpio_emul.h> diff --git a/zephyr/test/drivers/default/src/lid_switch.c b/zephyr/test/drivers/default/src/lid_switch.c index b52af6219c..00ccba291e 100644 --- a/zephyr/test/drivers/default/src/lid_switch.c +++ b/zephyr/test/drivers/default/src/lid_switch.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <ztest.h> +#include <zephyr/ztest.h> #include <zephyr/drivers/emul.h> #include <zephyr/drivers/gpio.h> #include <zephyr/drivers/gpio/gpio_emul.h> diff --git a/zephyr/test/drivers/default/src/lis2dw12.c b/zephyr/test/drivers/default/src/lis2dw12.c index 0996b96181..7d25cf18b9 100644 --- a/zephyr/test/drivers/default/src/lis2dw12.c +++ b/zephyr/test/drivers/default/src/lis2dw12.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <ztest.h> +#include <zephyr/ztest.h> #include <zephyr/drivers/emul.h> #include "driver/accel_lis2dw12.h" #include "emul/emul_common_i2c.h" diff --git a/zephyr/test/drivers/default/src/ln9310.c b/zephyr/test/drivers/default/src/ln9310.c index 634e537e3d..0d40767740 100644 --- a/zephyr/test/drivers/default/src/ln9310.c +++ b/zephyr/test/drivers/default/src/ln9310.c @@ -3,10 +3,10 @@ * found in the LICENSE file. */ -#include <ztest.h> +#include <zephyr/ztest.h> #include <zephyr/drivers/emul.h> #include <zephyr/kernel.h> -#include <ztest_assert.h> +#include <zephyr/ztest_assert.h> #include <zephyr/drivers/i2c_emul.h> #include "driver/ln9310.h" diff --git a/zephyr/test/drivers/default/src/motion_sense/motion_sense.c b/zephyr/test/drivers/default/src/motion_sense/motion_sense.c index 5b6839bbae..443f7dfbd2 100644 --- a/zephyr/test/drivers/default/src/motion_sense/motion_sense.c +++ b/zephyr/test/drivers/default/src/motion_sense/motion_sense.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <ztest.h> +#include <zephyr/ztest.h> #include "motion_sense.h" #include "test/drivers/test_state.h" diff --git a/zephyr/test/drivers/default/src/panic.c b/zephyr/test/drivers/default/src/panic.c index 2ee12b34c3..052d9916ef 100644 --- a/zephyr/test/drivers/default/src/panic.c +++ b/zephyr/test/drivers/default/src/panic.c @@ -12,7 +12,7 @@ #include <zephyr/logging/log.h> #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "common.h" #include "ec_tasks.h" diff --git a/zephyr/test/drivers/default/src/power_common.c b/zephyr/test/drivers/default/src/power_common.c index 869aef8898..17a8a4627e 100644 --- a/zephyr/test/drivers/default/src/power_common.c +++ b/zephyr/test/drivers/default/src/power_common.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <ztest.h> +#include <zephyr/ztest.h> #include <zephyr/drivers/gpio.h> #include <zephyr/drivers/gpio/gpio_emul.h> #include <zephyr/shell/shell.h> diff --git a/zephyr/test/drivers/default/src/ppc_sn5s330.c b/zephyr/test/drivers/default/src/ppc_sn5s330.c index ba41c5c07a..1810fcf732 100644 --- a/zephyr/test/drivers/default/src/ppc_sn5s330.c +++ b/zephyr/test/drivers/default/src/ppc_sn5s330.c @@ -7,8 +7,8 @@ #include <zephyr/device.h> #include <zephyr/devicetree.h> #include <zephyr/drivers/emul.h> -#include <ztest.h> -#include <fff.h> +#include <zephyr/ztest.h> +#include <zephyr/fff.h> #include "driver/ppc/sn5s330.h" #include "driver/ppc/sn5s330_public.h" diff --git a/zephyr/test/drivers/default/src/ppc_syv682x.c b/zephyr/test/drivers/default/src/ppc_syv682x.c index 6f67d245fc..ed2973135d 100644 --- a/zephyr/test/drivers/default/src/ppc_syv682x.c +++ b/zephyr/test/drivers/default/src/ppc_syv682x.c @@ -7,10 +7,10 @@ #include <zephyr/devicetree/gpio.h> #include <zephyr/drivers/gpio/gpio_emul.h> #include <zephyr/drivers/gpio.h> -#include <fff.h> +#include <zephyr/fff.h> #include <zephyr/zephyr.h> -#include <ztest.h> -#include <ztest_assert.h> +#include <zephyr/ztest.h> +#include <zephyr/ztest_assert.h> #include "emul/emul_common_i2c.h" #include "emul/emul_syv682x.h" diff --git a/zephyr/test/drivers/default/src/ps8xxx.c b/zephyr/test/drivers/default/src/ps8xxx.c index 273d81727d..0207f3ecd0 100644 --- a/zephyr/test/drivers/default/src/ps8xxx.c +++ b/zephyr/test/drivers/default/src/ps8xxx.c @@ -4,7 +4,7 @@ */ #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "common.h" #include "emul/emul_common_i2c.h" diff --git a/zephyr/test/drivers/default/src/smart.c b/zephyr/test/drivers/default/src/smart.c index 7756621a9f..0a16b3aaf7 100644 --- a/zephyr/test/drivers/default/src/smart.c +++ b/zephyr/test/drivers/default/src/smart.c @@ -4,7 +4,7 @@ */ #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include <zephyr/shell/shell.h> #include <zephyr/shell/shell_uart.h> diff --git a/zephyr/test/drivers/default/src/stm_mems_common.c b/zephyr/test/drivers/default/src/stm_mems_common.c index ab24a0eefc..0d6911e054 100644 --- a/zephyr/test/drivers/default/src/stm_mems_common.c +++ b/zephyr/test/drivers/default/src/stm_mems_common.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <ztest.h> +#include <zephyr/ztest.h> #include <zephyr/device.h> #include <zephyr/devicetree.h> #include <errno.h> diff --git a/zephyr/test/drivers/default/src/tcpci.c b/zephyr/test/drivers/default/src/tcpci.c index 243838dea3..2dbafae8c5 100644 --- a/zephyr/test/drivers/default/src/tcpci.c +++ b/zephyr/test/drivers/default/src/tcpci.c @@ -4,7 +4,7 @@ */ #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include <zephyr/drivers/gpio.h> #include <zephyr/drivers/gpio/gpio_emul.h> diff --git a/zephyr/test/drivers/default/src/tcpci_test_common.c b/zephyr/test/drivers/default/src/tcpci_test_common.c index 934bdd1369..1369b44a08 100644 --- a/zephyr/test/drivers/default/src/tcpci_test_common.c +++ b/zephyr/test/drivers/default/src/tcpci_test_common.c @@ -4,7 +4,7 @@ */ #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "common.h" #include "emul/emul_common_i2c.h" diff --git a/zephyr/test/drivers/default/src/tcs3400.c b/zephyr/test/drivers/default/src/tcs3400.c index 6ef1c20dab..393b8ee6f2 100644 --- a/zephyr/test/drivers/default/src/tcs3400.c +++ b/zephyr/test/drivers/default/src/tcs3400.c @@ -4,7 +4,7 @@ */ #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "common.h" #include "i2c.h" diff --git a/zephyr/test/drivers/default/src/temp_sensor.c b/zephyr/test/drivers/default/src/temp_sensor.c index 4b63c6ab8a..a4a514b7db 100644 --- a/zephyr/test/drivers/default/src/temp_sensor.c +++ b/zephyr/test/drivers/default/src/temp_sensor.c @@ -4,7 +4,7 @@ */ #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include <zephyr/drivers/adc.h> #include <zephyr/drivers/adc/adc_emul.h> #include <zephyr/drivers/gpio.h> diff --git a/zephyr/test/drivers/default/src/thermistor.c b/zephyr/test/drivers/default/src/thermistor.c index 5a29ac7e89..d23568ed90 100644 --- a/zephyr/test/drivers/default/src/thermistor.c +++ b/zephyr/test/drivers/default/src/thermistor.c @@ -4,7 +4,7 @@ */ #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include <zephyr/drivers/adc.h> #include <zephyr/drivers/adc/adc_emul.h> #include <zephyr/drivers/gpio.h> diff --git a/zephyr/test/drivers/default/src/uart_hostcmd.c b/zephyr/test/drivers/default/src/uart_hostcmd.c index d599e76985..2b65481382 100644 --- a/zephyr/test/drivers/default/src/uart_hostcmd.c +++ b/zephyr/test/drivers/default/src/uart_hostcmd.c @@ -4,7 +4,7 @@ */ #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "console.h" #include "host_command.h" diff --git a/zephyr/test/drivers/default/src/usb_mux.c b/zephyr/test/drivers/default/src/usb_mux.c index 8fdadd5cde..2350c406e7 100644 --- a/zephyr/test/drivers/default/src/usb_mux.c +++ b/zephyr/test/drivers/default/src/usb_mux.c @@ -5,7 +5,7 @@ #include <zephyr/kernel.h> #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include <zephyr/drivers/gpio.h> #include <zephyr/drivers/gpio/gpio_emul.h> #include <zephyr/shell/shell.h> @@ -14,7 +14,7 @@ #include "common.h" #include "ec_commands.h" #include "ec_tasks.h" -#include "fff.h" +#include <zephyr/fff.h> #include "hooks.h" #include "host_command.h" #include "i2c.h" diff --git a/zephyr/test/drivers/default/src/usb_pd_host_cmd.c b/zephyr/test/drivers/default/src/usb_pd_host_cmd.c index bd421e7537..0a67c608f9 100644 --- a/zephyr/test/drivers/default/src/usb_pd_host_cmd.c +++ b/zephyr/test/drivers/default/src/usb_pd_host_cmd.c @@ -4,7 +4,7 @@ */ #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "ec_commands.h" #include "host_command.h" diff --git a/zephyr/test/drivers/default/src/vboot_hash.c b/zephyr/test/drivers/default/src/vboot_hash.c index ac23b95b02..a6fad0161d 100644 --- a/zephyr/test/drivers/default/src/vboot_hash.c +++ b/zephyr/test/drivers/default/src/vboot_hash.c @@ -4,7 +4,7 @@ */ #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include <sha256.h> #include "ec_commands.h" diff --git a/zephyr/test/drivers/default/src/watchdog.c b/zephyr/test/drivers/default/src/watchdog.c index bddde3fa50..82d180eea8 100644 --- a/zephyr/test/drivers/default/src/watchdog.c +++ b/zephyr/test/drivers/default/src/watchdog.c @@ -13,11 +13,11 @@ #include <zephyr/logging/log.h> #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "common.h" #include "ec_tasks.h" -#include "fff.h" +#include <zephyr/fff.h> #include "hooks.h" #include "test/drivers/stubs.h" #include "watchdog.h" diff --git a/zephyr/test/drivers/isl923x/src/charge_ramp_hw.c b/zephyr/test/drivers/isl923x/src/charge_ramp_hw.c index 298f71d5b7..acde1916b8 100644 --- a/zephyr/test/drivers/isl923x/src/charge_ramp_hw.c +++ b/zephyr/test/drivers/isl923x/src/charge_ramp_hw.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <ztest.h> +#include <zephyr/ztest.h> #include "driver/charger/isl923x.h" #include "driver/charger/isl923x_public.h" diff --git a/zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c b/zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c index 3825f4bc36..a5c9c004fa 100644 --- a/zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c +++ b/zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c @@ -6,7 +6,7 @@ #include <zephyr/drivers/adc.h> #include <zephyr/drivers/adc/adc_emul.h> #include <zephyr/shell/shell.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "adc.h" #include "console.h" diff --git a/zephyr/test/drivers/led_driver/src/led.c b/zephyr/test/drivers/led_driver/src/led.c index 3d029d4140..80bcc7e061 100644 --- a/zephyr/test/drivers/led_driver/src/led.c +++ b/zephyr/test/drivers/led_driver/src/led.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <ztest.h> +#include <zephyr/ztest.h> #include "ec_commands.h" #include "gpio.h" #include "include/power.h" diff --git a/zephyr/test/drivers/usb_malfunction_sink/src/usb_malfunction_sink.c b/zephyr/test/drivers/usb_malfunction_sink/src/usb_malfunction_sink.c index 0978d10298..067ec827d3 100644 --- a/zephyr/test/drivers/usb_malfunction_sink/src/usb_malfunction_sink.c +++ b/zephyr/test/drivers/usb_malfunction_sink/src/usb_malfunction_sink.c @@ -5,7 +5,7 @@ #include <stdint.h> #include <zephyr/sys/byteorder.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "battery_smart.h" #include "emul/emul_isl923x.h" diff --git a/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode.c b/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode.c index ff2a372a7f..f8f874f7dc 100644 --- a/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode.c +++ b/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode.c @@ -5,7 +5,7 @@ #include <stdint.h> #include <zephyr/zephyr.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include <zephyr/drivers/gpio/gpio_emul.h> #include "ec_commands.h" diff --git a/zephyr/test/ec_app/src/main.c b/zephyr/test/ec_app/src/main.c index 51beeb37d9..ca6f3ed393 100644 --- a/zephyr/test/ec_app/src/main.c +++ b/zephyr/test/ec_app/src/main.c @@ -3,8 +3,8 @@ * found in the LICENSE file. */ -#include <ztest_assert.h> -#include <ztest_test_new.h> +#include <zephyr/ztest_assert.h> +#include <zephyr/ztest_test_new.h> #include "ec_app_main.h" #include "hooks.h" diff --git a/zephyr/test/hooks/hooks.c b/zephyr/test/hooks/hooks.c index a06f4f36a7..ae6f6b63ab 100644 --- a/zephyr/test/hooks/hooks.c +++ b/zephyr/test/hooks/hooks.c @@ -4,7 +4,7 @@ */ #include <stdbool.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "ap_power/ap_power.h" #include "hooks.h" diff --git a/zephyr/test/i2c/src/main.c b/zephyr/test/i2c/src/main.c index ddcee740cd..e7831b0ec4 100644 --- a/zephyr/test/i2c/src/main.c +++ b/zephyr/test/i2c/src/main.c @@ -4,7 +4,7 @@ */ #include <zephyr/devicetree.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "common.h" #include "i2c/i2c.h" diff --git a/zephyr/test/i2c_dts/src/main.c b/zephyr/test/i2c_dts/src/main.c index 1a84b18d8e..122916f153 100644 --- a/zephyr/test/i2c_dts/src/main.c +++ b/zephyr/test/i2c_dts/src/main.c @@ -5,7 +5,7 @@ #include <zephyr/device.h> #include <zephyr/devicetree.h> -#include <ztest.h> +#include <zephyr/ztest.h> ZTEST(i2c_bindings, test_i2c_get_device) { diff --git a/zephyr/test/math/src/fixed_point_int_sqrtf.c b/zephyr/test/math/src/fixed_point_int_sqrtf.c index d8360ec189..1fcfb5bcbe 100644 --- a/zephyr/test/math/src/fixed_point_int_sqrtf.c +++ b/zephyr/test/math/src/fixed_point_int_sqrtf.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <ztest.h> +#include <zephyr/ztest.h> #include "math.h" #include "math_util.h" diff --git a/zephyr/test/math/src/mask.c b/zephyr/test/math/src/mask.c index 9ced211a88..2d803eaa76 100644 --- a/zephyr/test/math/src/mask.c +++ b/zephyr/test/math/src/mask.c @@ -4,7 +4,7 @@ */ #include <inttypes.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "math.h" #include "math_util.h" diff --git a/zephyr/test/math/src/math_util.c b/zephyr/test/math/src/math_util.c index 901c3a6cc6..9b3ce6711e 100644 --- a/zephyr/test/math/src/math_util.c +++ b/zephyr/test/math/src/math_util.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <ztest.h> +#include <zephyr/ztest.h> #include "math.h" #include "math_util.h" diff --git a/zephyr/test/math/src/suite.c b/zephyr/test/math/src/suite.c index 75b8e84bde..a174c57cee 100644 --- a/zephyr/test/math/src/suite.c +++ b/zephyr/test/math/src/suite.c @@ -3,6 +3,6 @@ * found in the LICENSE file. */ -#include <ztest.h> +#include <zephyr/ztest.h> ZTEST_SUITE(math, NULL, NULL, NULL, NULL, NULL); diff --git a/zephyr/test/math/src/vector.c b/zephyr/test/math/src/vector.c index 2e8ca52c5d..481c22a3f6 100644 --- a/zephyr/test/math/src/vector.c +++ b/zephyr/test/math/src/vector.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <ztest.h> +#include <zephyr/ztest.h> #include "math.h" #include "math_util.h" diff --git a/zephyr/test/system/test_system.c b/zephyr/test/system/test_system.c index 77ebd1a715..45aed5dfff 100644 --- a/zephyr/test/system/test_system.c +++ b/zephyr/test/system/test_system.c @@ -6,8 +6,8 @@ #include <zephyr/device.h> #include <zephyr/drivers/bbram.h> #include <zephyr/logging/log.h> -#include <ztest_assert.h> -#include <ztest_test_new.h> +#include <zephyr/ztest_assert.h> +#include <zephyr/ztest_test_new.h> #include "system.h" diff --git a/zephyr/test/tasks/main.c b/zephyr/test/tasks/main.c index 7d7b0053ea..64d4b16f80 100644 --- a/zephyr/test/tasks/main.c +++ b/zephyr/test/tasks/main.c @@ -5,7 +5,7 @@ #include <zephyr/kernel.h> #include <stdbool.h> -#include <ztest.h> +#include <zephyr/ztest.h> #include "ec_tasks.h" #include "task.h" |