[OSCBS-41] Update to Zephyr v3.2.0 (#382)
Updating to integrate with Zephyr v3.2.0 required: - Update `west.yml` to import Zephyr v3.2.0 manifest - Prefix include pathname of ztest.h with `zephyr/` - Prefix every Zephyr header included pathname with `zephyr/` - Change all Zephyr tests/samples to use `find_package` - For unit_testing, use a distinct prj.conf which only references Kconfigs defined in the Zephyr repo. (Zephyr constraint.) - Move ztest headers into a zephyr-prefixed pathname Co-authored-by: Gregory Shue <gregory.shue@legrand.com>
This commit is contained in:
@@ -9,13 +9,13 @@
|
||||
#ifndef ZEPHYR_TESTSUITE_INCLUDE_TC_UTIL_H_
|
||||
#define ZEPHYR_TESTSUITE_INCLUDE_TC_UTIL_H_
|
||||
|
||||
#include <zephyr.h>
|
||||
#include <zephyr/kernel.h>
|
||||
|
||||
#include <string.h>
|
||||
#ifdef CONFIG_SHELL
|
||||
#include <shell/shell.h>
|
||||
#include <zephyr/shell/shell.h>
|
||||
#endif
|
||||
#include <sys/printk.h>
|
||||
#include <zephyr/sys/printk.h>
|
||||
|
||||
#if defined CONFIG_ZTEST_TC_UTIL_USER_OVERRIDE
|
||||
#include <tc_util_user_override.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)
|
||||
@@ -58,15 +58,15 @@ typedef struct esf z_arch_esf_t;
|
||||
#endif
|
||||
#endif /* KERNEL */
|
||||
|
||||
#include <sys/printk.h>
|
||||
#include <zephyr/sys/printk.h>
|
||||
#define PRINT printk
|
||||
|
||||
#include <zephyr.h>
|
||||
#include <zephyr/kernel.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" {
|
||||
@@ -13,7 +13,7 @@
|
||||
#ifndef ZEPHYR_TESTSUITE_ZTEST_ASSERT_H_
|
||||
#define ZEPHYR_TESTSUITE_ZTEST_ASSERT_H_
|
||||
|
||||
#include <ztest.h>
|
||||
#include <zephyr/ztest.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
#ifndef ZEPHYR_INCLUDE_ZTEST_FATAL_HOOK_H_
|
||||
#define ZEPHYR_INCLUDE_ZTEST_FATAL_HOOK_H_
|
||||
|
||||
#include <zephyr.h>
|
||||
#include <zephyr/kernel.h>
|
||||
|
||||
|
||||
#if defined(CONFIG_ZTEST_FATAL_HOOK)
|
||||
@@ -4,9 +4,9 @@
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include <ztest.h>
|
||||
#include <zephyr/ztest.h>
|
||||
#include <stdio.h>
|
||||
#include <tc_util.h>
|
||||
#include <zephyr/tc_util.h>
|
||||
#if 0
|
||||
#include <app_memory/app_memdomain.h>
|
||||
#ifdef CONFIG_USERSPACE
|
||||
@@ -15,7 +15,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef KERNEL
|
||||
#include <sys/reboot.h>
|
||||
#include <zephyr/sys/reboot.h>
|
||||
static struct k_thread ztest_thread;
|
||||
#endif
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
#include <zephyr.h>
|
||||
#include <ztest.h>
|
||||
#include <zephyr/kernel.h>
|
||||
#include <zephyr/ztest.h>
|
||||
|
||||
|
||||
#if defined(CONFIG_ZTEST_FATAL_HOOK)
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#ifdef KERNEL
|
||||
#error Why is KERNEL defined by hered?
|
||||
#endif
|
||||
#include <ztest.h>
|
||||
#include <zephyr/ztest.h>
|
||||
#ifdef KERNEL
|
||||
#error Why is KERNEL defined by hered?
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user