Issues/issue 461 update to zephyr v3 4 0 in ci (#463)
* [WIP] Remove unit testcases duplicated under non-unit tree * [WIP] Update west.yml to Zephyr v3.3.0 (twister verified) * Update CI to Zephyr v3.4.0 w/ reduced module set - Update zephyr/module.yml to use Zephyr v3.4.0 + cmsis; - Update tests to use ZTEST_NEW_API for zephyr builds Verified by: 1. make clean test 2. ./zephyr/scripts/twister -p unit_testing -T bacnet/zephyr/tests/bacnet --------- Co-authored-by: Gregory Shue <gregory.shue@legrand.com>
This commit is contained in:
@@ -32,7 +32,11 @@ void bvlc6_maintenance_timer(uint16_t seconds)
|
||||
* @brief Test datalink
|
||||
*/
|
||||
|
||||
#if defined(CONFIG_ZTEST_NEW_API)
|
||||
ZTEST(datalink_tests, test_datalink_arcnet)
|
||||
#else
|
||||
static void test_datalink_arcnet(void)
|
||||
#endif
|
||||
{
|
||||
char *iface = "bla-bla-bla";
|
||||
char *iface2 = "bla-bla-bla2";
|
||||
@@ -109,7 +113,11 @@ static void test_datalink_arcnet(void)
|
||||
datalink_maintenance_timer(42);
|
||||
}
|
||||
|
||||
#if defined(CONFIG_ZTEST_NEW_API)
|
||||
ZTEST(datalink_tests, test_datalink_bip)
|
||||
#else
|
||||
static void test_datalink_bip(void)
|
||||
#endif
|
||||
{
|
||||
char *iface = "bla-bla-bla";
|
||||
char *iface2 = "bla-bla-bla2";
|
||||
@@ -189,7 +197,11 @@ static void test_datalink_bip(void)
|
||||
zassert_equal(z_cleanup_mock(), 0, NULL);
|
||||
}
|
||||
|
||||
#if defined(CONFIG_ZTEST_NEW_API)
|
||||
ZTEST(datalink_tests, test_datalink_bip6)
|
||||
#else
|
||||
static void test_datalink_bip6(void)
|
||||
#endif
|
||||
{
|
||||
char *iface = "bla-bla-bla";
|
||||
char *iface2 = "bla-bla-bla2";
|
||||
@@ -268,7 +280,11 @@ static void test_datalink_bip6(void)
|
||||
zassert_equal(z_cleanup_mock(), 0, NULL);
|
||||
}
|
||||
|
||||
#if defined(CONFIG_ZTEST_NEW_API)
|
||||
ZTEST(datalink_tests, test_datalink_dlmstp)
|
||||
#else
|
||||
static void test_datalink_dlmstp(void)
|
||||
#endif
|
||||
{
|
||||
char *iface = "bla-bla-bla";
|
||||
char *iface2 = "bla-bla-bla2";
|
||||
@@ -345,7 +361,11 @@ static void test_datalink_dlmstp(void)
|
||||
datalink_maintenance_timer(42);
|
||||
}
|
||||
|
||||
#if defined(CONFIG_ZTEST_NEW_API)
|
||||
ZTEST(datalink_tests, )
|
||||
#else
|
||||
static void test_datalink_ethernet(void)
|
||||
#endif
|
||||
{
|
||||
char *iface = "bla-bla-bla";
|
||||
char *iface2 = "bla-bla-bla2";
|
||||
@@ -427,6 +447,9 @@ static void test_datalink_ethernet(void)
|
||||
* @}
|
||||
*/
|
||||
|
||||
#if defined(CONFIG_ZTEST_NEW_API)
|
||||
ZTEST_SUITE(datalink_tests, NULL, NULL, NULL, NULL, NULL);
|
||||
#else
|
||||
void test_main(void)
|
||||
{
|
||||
ztest_test_suite(datalink_tests,
|
||||
@@ -439,3 +462,4 @@ void test_main(void)
|
||||
|
||||
ztest_run_test_suite(datalink_tests);
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user