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:
@@ -80,7 +80,11 @@ static void set_file_address(const char *pFilename,
|
||||
|
||||
#ifdef BACNET_ADDRESS_CACHE_FILE
|
||||
/* Validate that the address data in the file */
|
||||
#if defined(CONFIG_ZTEST_NEW_API)
|
||||
ZTEST(address_tests, testAddressFile)
|
||||
#else
|
||||
static void testAddressFile(void)
|
||||
#endif
|
||||
{
|
||||
BACNET_ADDRESS src = { 0 };
|
||||
uint32_t device_id = 0;
|
||||
@@ -138,7 +142,11 @@ static void testAddressFile(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_ZTEST_NEW_API)
|
||||
ZTEST(address_tests, testAddress)
|
||||
#else
|
||||
static void testAddress(void)
|
||||
#endif
|
||||
{
|
||||
unsigned i, count;
|
||||
BACNET_ADDRESS src;
|
||||
@@ -191,6 +199,9 @@ static void testAddress(void)
|
||||
*/
|
||||
|
||||
|
||||
#if defined(CONFIG_ZTEST_NEW_API)
|
||||
ZTEST_SUITE(address_tests, NULL, NULL, NULL, NULL, NULL);
|
||||
#else
|
||||
void test_main(void)
|
||||
{
|
||||
#ifdef BACNET_ADDRESS_CACHE_FILE
|
||||
@@ -209,3 +220,4 @@ void test_main(void)
|
||||
#endif
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user