From 78f73402668e71af168b6ebf36d455c6bf215045 Mon Sep 17 00:00:00 2001 From: Greg Shue <32416235+gregshue@users.noreply.github.com> Date: Fri, 15 Mar 2024 08:29:05 -0700 Subject: [PATCH] Issues/issue 593 update to zephyr v3 6 0 (#601) * [WIP] update manifest to zephyr v3.6.0 * [WIP] Deprecated ZTEST_NEW_API adjustments Zephyr v3.6.0 removed Kconfig ZTEST_NEW_API. The old ZTEST API is still used by non-Zephyr builds, so the config setting is moved from `prj.conf` to the test's CMakeLists.txt as `add_compile_definitions()`. Verified by: 1. make clean all test 2. ./zephyr/scripts/twister -p unit_testing \ -T bacnet-stack/zephyr/tests/ --------- Co-authored-by: Gregory Shue --- test/bacnet/basic/object/calendar/src/main.c | 12 ++++ .../bacnet/basic/object/time_value/src/main.c | 8 +++ test/bacnet/datetime/src/main.c | 4 ++ test/unit/bacnet/bacerror/src/main.c | 12 ++++ test/unit/bacnet/bacint/src/main.c | 56 +++++++++++++++++++ test/unit/bacnet/bits/src/main.c | 44 +++++++++++++++ west.yml | 2 +- zephyr/tests/bacnet/abort/CMakeLists.txt | 2 + zephyr/tests/bacnet/abort/prj.conf | 1 - zephyr/tests/bacnet/alarm_ack/CMakeLists.txt | 2 + zephyr/tests/bacnet/alarm_ack/prj.conf | 1 - zephyr/tests/bacnet/arf/CMakeLists.txt | 2 + zephyr/tests/bacnet/arf/prj.conf | 1 - zephyr/tests/bacnet/awf/CMakeLists.txt | 2 + zephyr/tests/bacnet/awf/prj.conf | 1 - zephyr/tests/bacnet/bacapp/CMakeLists.txt | 2 + zephyr/tests/bacnet/bacapp/prj.conf | 1 - zephyr/tests/bacnet/bacdcode/CMakeLists.txt | 2 + zephyr/tests/bacnet/bacdcode/prj.conf | 1 - .../bacnet/bacdevobjpropref/CMakeLists.txt | 2 + zephyr/tests/bacnet/bacdevobjpropref/prj.conf | 1 - zephyr/tests/bacnet/bacerror/CMakeLists.txt | 2 + zephyr/tests/bacnet/bacerror/prj.conf | 1 - zephyr/tests/bacnet/bacint/CMakeLists.txt | 2 + zephyr/tests/bacnet/bacint/prj.conf | 1 - .../tests/bacnet/bacpropstates/CMakeLists.txt | 2 + zephyr/tests/bacnet/bacpropstates/prj.conf | 1 - zephyr/tests/bacnet/bacreal/CMakeLists.txt | 2 + zephyr/tests/bacnet/bacreal/prj.conf | 1 - zephyr/tests/bacnet/bacstr/CMakeLists.txt | 2 + zephyr/tests/bacnet/bacstr/prj.conf | 1 - .../basic/binding/address/CMakeLists.txt | 2 + .../bacnet/basic/binding/address/prj.conf | 1 - .../bacnet/basic/object/acc/CMakeLists.txt | 2 + zephyr/tests/bacnet/basic/object/acc/prj.conf | 1 - .../object/access_credential/CMakeLists.txt | 2 + .../basic/object/access_credential/prj.conf | 1 - .../basic/object/access_door/CMakeLists.txt | 2 + .../bacnet/basic/object/access_door/prj.conf | 1 - .../basic/object/access_point/CMakeLists.txt | 2 + .../bacnet/basic/object/access_point/prj.conf | 1 - .../basic/object/access_rights/CMakeLists.txt | 2 + .../basic/object/access_rights/prj.conf | 1 - .../basic/object/access_user/CMakeLists.txt | 2 + .../bacnet/basic/object/access_user/prj.conf | 1 - .../basic/object/access_zone/CMakeLists.txt | 2 + .../bacnet/basic/object/access_zone/prj.conf | 1 - .../bacnet/basic/object/ai/CMakeLists.txt | 2 + zephyr/tests/bacnet/basic/object/ai/prj.conf | 1 - .../bacnet/basic/object/ao/CMakeLists.txt | 2 + zephyr/tests/bacnet/basic/object/ao/prj.conf | 1 - .../bacnet/basic/object/av/CMakeLists.txt | 2 + zephyr/tests/bacnet/basic/object/av/prj.conf | 1 - .../bacnet/basic/object/bi/CMakeLists.txt | 2 + zephyr/tests/bacnet/basic/object/bi/prj.conf | 1 - .../bacnet/basic/object/bo/CMakeLists.txt | 2 + zephyr/tests/bacnet/basic/object/bo/prj.conf | 1 - .../bacnet/basic/object/bv/CMakeLists.txt | 2 + zephyr/tests/bacnet/basic/object/bv/prj.conf | 1 - .../basic/object/calendar/CMakeLists.txt | 2 + .../basic/object/color_object/CMakeLists.txt | 2 + .../bacnet/basic/object/color_object/prj.conf | 1 - .../object/color_temperature/CMakeLists.txt | 2 + .../basic/object/color_temperature/prj.conf | 1 - .../basic/object/command/CMakeLists.txt | 2 + .../bacnet/basic/object/command/prj.conf | 1 - .../credential_data_input/CMakeLists.txt | 2 + .../object/credential_data_input/prj.conf | 1 - .../bacnet/basic/object/device/CMakeLists.txt | 2 + .../tests/bacnet/basic/object/device/prj.conf | 1 - .../bacnet/basic/object/lc/CMakeLists.txt | 2 + zephyr/tests/bacnet/basic/object/lc/prj.conf | 1 - .../bacnet/basic/object/lo/CMakeLists.txt | 2 + zephyr/tests/bacnet/basic/object/lo/prj.conf | 1 - .../bacnet/basic/object/lsp/CMakeLists.txt | 2 + zephyr/tests/bacnet/basic/object/lsp/prj.conf | 1 - .../basic/object/ms-input/CMakeLists.txt | 2 + .../bacnet/basic/object/ms-input/prj.conf | 1 - .../bacnet/basic/object/mso/CMakeLists.txt | 2 + zephyr/tests/bacnet/basic/object/mso/prj.conf | 1 - .../bacnet/basic/object/msv/CMakeLists.txt | 2 + zephyr/tests/bacnet/basic/object/msv/prj.conf | 1 - .../basic/object/netport/CMakeLists.txt | 2 + .../bacnet/basic/object/netport/prj.conf | 1 - .../basic/object/objects/CMakeLists.txt | 2 + .../bacnet/basic/object/objects/prj.conf | 1 - .../bacnet/basic/object/osv/CMakeLists.txt | 2 + zephyr/tests/bacnet/basic/object/osv/prj.conf | 1 - .../bacnet/basic/object/piv/CMakeLists.txt | 2 + zephyr/tests/bacnet/basic/object/piv/prj.conf | 1 - .../basic/object/schedule/CMakeLists.txt | 2 + .../bacnet/basic/object/schedule/prj.conf | 1 - .../basic/object/time_value/CMakeLists.txt | 2 + .../bacnet/basic/sys/fifo/CMakeLists.txt | 2 + zephyr/tests/bacnet/basic/sys/fifo/prj.conf | 1 - .../bacnet/basic/sys/filename/CMakeLists.txt | 2 + .../tests/bacnet/basic/sys/filename/prj.conf | 1 - .../tests/bacnet/basic/sys/key/CMakeLists.txt | 2 + zephyr/tests/bacnet/basic/sys/key/prj.conf | 1 - .../bacnet/basic/sys/keylist/CMakeLists.txt | 2 + .../tests/bacnet/basic/sys/keylist/prj.conf | 1 - .../bacnet/basic/sys/ringbuf/CMakeLists.txt | 2 + .../tests/bacnet/basic/sys/ringbuf/prj.conf | 1 - .../bacnet/basic/sys/sbuf/CMakeLists.txt | 2 + zephyr/tests/bacnet/basic/sys/sbuf/prj.conf | 1 - zephyr/tests/bacnet/cov/CMakeLists.txt | 2 + zephyr/tests/bacnet/cov/prj.conf | 1 - .../tests/bacnet/datalink/bvlc/CMakeLists.txt | 2 + zephyr/tests/bacnet/datalink/bvlc/prj.conf | 1 - .../tests/bacnet/datalink/cobs/CMakeLists.txt | 2 + zephyr/tests/bacnet/datalink/cobs/prj.conf | 1 - .../tests/bacnet/datalink/crc/CMakeLists.txt | 2 + zephyr/tests/bacnet/datalink/crc/prj.conf | 1 - .../tests/bacnet/datalink/mock/CMakeLists.txt | 2 + zephyr/tests/bacnet/datalink/mock/prj.conf | 1 - zephyr/tests/bacnet/datetime/CMakeLists.txt | 2 + zephyr/tests/bacnet/datetime/prj.conf | 1 - zephyr/tests/bacnet/dcc/CMakeLists.txt | 2 + zephyr/tests/bacnet/dcc/prj.conf | 1 - zephyr/tests/bacnet/event/CMakeLists.txt | 2 + zephyr/tests/bacnet/event/prj.conf | 1 - zephyr/tests/bacnet/getevent/CMakeLists.txt | 2 + zephyr/tests/bacnet/getevent/prj.conf | 1 - zephyr/tests/bacnet/iam/CMakeLists.txt | 2 + zephyr/tests/bacnet/iam/prj.conf | 1 - zephyr/tests/bacnet/ihave/CMakeLists.txt | 2 + zephyr/tests/bacnet/ihave/prj.conf | 1 - zephyr/tests/bacnet/indtext/CMakeLists.txt | 2 + zephyr/tests/bacnet/indtext/prj.conf | 1 - zephyr/tests/bacnet/lighting/CMakeLists.txt | 2 + zephyr/tests/bacnet/lighting/prj.conf | 1 - zephyr/tests/bacnet/lso/CMakeLists.txt | 2 + zephyr/tests/bacnet/lso/prj.conf | 1 - zephyr/tests/bacnet/memcopy/CMakeLists.txt | 2 + zephyr/tests/bacnet/memcopy/prj.conf | 1 - zephyr/tests/bacnet/npdu/CMakeLists.txt | 2 + zephyr/tests/bacnet/npdu/prj.conf | 1 - zephyr/tests/bacnet/property/CMakeLists.txt | 2 + zephyr/tests/bacnet/property/prj.conf | 1 - zephyr/tests/bacnet/ptransfer/CMakeLists.txt | 2 + zephyr/tests/bacnet/ptransfer/prj.conf | 1 - zephyr/tests/bacnet/rd/CMakeLists.txt | 2 + zephyr/tests/bacnet/rd/prj.conf | 1 - zephyr/tests/bacnet/reject/CMakeLists.txt | 2 + zephyr/tests/bacnet/reject/prj.conf | 1 - zephyr/tests/bacnet/rp/CMakeLists.txt | 2 + zephyr/tests/bacnet/rp/prj.conf | 1 - zephyr/tests/bacnet/rpm/CMakeLists.txt | 2 + zephyr/tests/bacnet/rpm/prj.conf | 1 - zephyr/tests/bacnet/timestamp/CMakeLists.txt | 2 + zephyr/tests/bacnet/timestamp/prj.conf | 1 - zephyr/tests/bacnet/timesync/CMakeLists.txt | 2 + zephyr/tests/bacnet/timesync/prj.conf | 1 - zephyr/tests/bacnet/whohas/CMakeLists.txt | 2 + zephyr/tests/bacnet/whohas/prj.conf | 1 - zephyr/tests/bacnet/whois/CMakeLists.txt | 2 + zephyr/tests/bacnet/whois/prj.conf | 1 - zephyr/tests/bacnet/wp/CMakeLists.txt | 2 + zephyr/tests/bacnet/wp/prj.conf | 1 - zephyr/tests/unit/bacnet/bits/CMakeLists.txt | 2 + 160 files changed, 293 insertions(+), 76 deletions(-) diff --git a/test/bacnet/basic/object/calendar/src/main.c b/test/bacnet/basic/object/calendar/src/main.c index e1dbddac..af58e18e 100644 --- a/test/bacnet/basic/object/calendar/src/main.c +++ b/test/bacnet/basic/object/calendar/src/main.c @@ -19,7 +19,11 @@ /** * @brief Test Calendar handling */ +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_calendar, testCalendar) +#else static void testCalendar(void) +#endif { uint8_t apdu[MAX_APDU] = { 0 }; int len = 0, test_len = 0; @@ -123,7 +127,11 @@ static void testCalendar(void) zassert_true(status, NULL); } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_calendar, testPresentValue) +#else static void testPresentValue(void) +#endif { const uint32_t instance = 1; BACNET_DATE date; @@ -228,6 +236,9 @@ static void testPresentValue(void) * @} */ +#ifdef CONFIG_ZTEST_NEW_API +ZTEST_SUITE(bacnet_calendar, NULL, NULL, NULL, NULL, NULL); +#else void test_main(void) { ztest_test_suite(calendar_tests, @@ -237,3 +248,4 @@ void test_main(void) ztest_run_test_suite(calendar_tests); } +#endif diff --git a/test/bacnet/basic/object/time_value/src/main.c b/test/bacnet/basic/object/time_value/src/main.c index 740a55e4..ff5ccb7f 100644 --- a/test/bacnet/basic/object/time_value/src/main.c +++ b/test/bacnet/basic/object/time_value/src/main.c @@ -19,7 +19,11 @@ /** * @brief Test Time Value handling */ +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_tv, testTimeValue) +#else static void testTimeValue(void) +#endif { uint8_t apdu[MAX_APDU] = { 0 }; int len = 0, test_len = 0; @@ -131,6 +135,9 @@ static void testTimeValue(void) * @} */ +#ifdef CONFIG_ZTEST_NEW_API +ZTEST_SUITE(bacnet_tv, NULL, NULL, NULL, NULL, NULL); +#else void test_main(void) { ztest_test_suite(tv_tests, @@ -139,3 +146,4 @@ void test_main(void) ztest_run_test_suite(tv_tests); } +#endif diff --git a/test/bacnet/datetime/src/main.c b/test/bacnet/datetime/src/main.c index de0dad68..b340da7b 100644 --- a/test/bacnet/datetime/src/main.c +++ b/test/bacnet/datetime/src/main.c @@ -602,7 +602,11 @@ static void testDatetimeConvertUTCSpecific(BACNET_DATE_TIME *utc_time, local_time->time.hundredths, test_local_time.time.hundredths, NULL); } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_datetime, testDatetimeConvertUTC) +#else static void testDatetimeConvertUTC(void) +#endif { BACNET_DATE_TIME local_time; BACNET_DATE_TIME utc_time; diff --git a/test/unit/bacnet/bacerror/src/main.c b/test/unit/bacnet/bacerror/src/main.c index 86f6b548..1f5a3ab7 100644 --- a/test/unit/bacnet/bacerror/src/main.c +++ b/test/unit/bacnet/bacerror/src/main.c @@ -149,7 +149,11 @@ static int decode_enumerated_custom_fake( * Tests: */ +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bacint, test_bacerror_encode_apdu) +#else static void test_bacerror_encode_apdu(void) +#endif { uint8_t test_apdu[32] = { 0 }; @@ -358,7 +362,11 @@ static void test_bacerror_encode_apdu(void) } } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bacerror, test_bacerror_decode_error_class_and_code) +#else static void test_bacerror_decode_error_class_and_code(void) +#endif { #if !BACNET_SVC_SERVER uint8_t test_apdu[32] = { 0 }; @@ -1118,6 +1126,9 @@ static void test_bacerror_decode_error_class_and_code(void) #endif } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST_SUITE(bacnet_error, NULL, NULL, NULL, NULL, NULL); +#else void test_main(void) { ztest_test_suite(bacnet_bacerror, @@ -1125,3 +1136,4 @@ void test_main(void) ztest_unit_test(test_bacerror_decode_error_class_and_code)); ztest_run_test_suite(bacnet_bacerror); } +#endif diff --git a/test/unit/bacnet/bacint/src/main.c b/test/unit/bacnet/bacint/src/main.c index 157d3842..4ffa7832 100644 --- a/test/unit/bacnet/bacint/src/main.c +++ b/test/unit/bacnet/bacint/src/main.c @@ -10,7 +10,11 @@ #include // for memset(), memcpy #include +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bacint, test_unsigned16) +#else static void test_unsigned16(void) +#endif { uint8_t apdu[8] = { 0 }; uint8_t test_apdu[8] = { 0 }; @@ -80,7 +84,11 @@ static void test_unsigned16(void) zassert_equal(test_value, value, NULL); } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bacint, test_unsigned24) +#else static void test_unsigned24(void) +#endif { uint8_t apdu[8] = { 0 }; uint8_t test_apdu[8] = { 0 }; @@ -154,7 +162,11 @@ static void test_unsigned24(void) zassert_equal(test_value, value, NULL); } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bacint, test_unsigned32) +#else static void test_unsigned32(void) +#endif { uint8_t apdu[8] = { 0 }; uint8_t test_apdu[8] = { 0 }; @@ -232,7 +244,11 @@ static void test_unsigned32(void) zassert_equal(test_value, value, NULL); } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bacint, test_unsigned40) +#else static void test_unsigned40(void) +#endif { #ifdef UINT64_MAX uint8_t apdu[12] = { 0 }; @@ -322,7 +338,11 @@ static void test_unsigned40(void) #endif /* defined(UINT64_MAX) */ } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bacint, test_unsigned48) +#else static void test_unsigned48(void) +#endif { #ifdef UINT64_MAX uint8_t apdu[12] = { 0 }; @@ -416,7 +436,11 @@ static void test_unsigned48(void) #endif /* defined(UINT64_MAX) */ } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bacint, test_unsigned56) +#else static void test_unsigned56(void) +#endif { #ifdef UINT64_MAX uint8_t apdu[12] = { 0 }; @@ -514,7 +538,11 @@ static void test_unsigned56(void) #endif /* defined(UINT64_MAX) */ } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bacint, test_unsigned64) +#else static void test_unsigned64(void) +#endif { #ifdef UINT64_MAX uint8_t apdu[12] = { 0 }; @@ -616,7 +644,11 @@ static void test_unsigned64(void) #endif /* defined(UINT64_MAX) */ } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bacint, test_unsigned_length) +#else static void test_unsigned_length(void) +#endif { zassert_equal(1, bacnet_unsigned_length(0), NULL); zassert_equal(1, bacnet_unsigned_length(0x7EUL), NULL); @@ -660,7 +692,11 @@ static void test_unsigned_length(void) #endif } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bacint, test_signed8) +#else static void test_signed8(void) +#endif { #if BACNET_USE_SIGNED uint8_t apdu[8] = { 0 }; @@ -734,7 +770,11 @@ static void test_signed8(void) #endif /* BACNET_USE_SIGNED */ } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bacint, test_signed16) +#else static void test_signed16(void) +#endif { #if BACNET_USE_SIGNED uint8_t apdu[8] = { 0 }; @@ -808,7 +848,11 @@ static void test_signed16(void) #endif /* BACNET_USE_SIGNED */ } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bacint, test_signed24) +#else static void test_signed24(void) +#endif { #if BACNET_USE_SIGNED uint8_t apdu[8] = { 0 }; @@ -886,7 +930,11 @@ static void test_signed24(void) #endif /* BACNET_USE_SIGNED */ } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bacint, test_signed32) +#else static void test_signed32(void) +#endif { #if BACNET_USE_SIGNED uint8_t apdu[8] = { 0 }; @@ -968,7 +1016,11 @@ static void test_signed32(void) #endif /* BACNET_USE_SIGNED */ } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bacint, test_signed_length) +#else static void test_signed_length(void) +#endif { #if BACNET_USE_SIGNED const int32_t sint24_max = 0x7FFFFFL; @@ -1000,6 +1052,9 @@ static void test_signed_length(void) } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST_SUITE(bacnet_bacint, NULL, NULL, NULL, NULL, NULL); +#else void test_main(void) { ztest_test_suite(bacnet_bacint, @@ -1019,3 +1074,4 @@ void test_main(void) ); ztest_run_test_suite(bacnet_bacint); } +#endif diff --git a/test/unit/bacnet/bits/src/main.c b/test/unit/bacnet/bits/src/main.c index 77b429cf..3c1fdeae 100644 --- a/test/unit/bacnet/bits/src/main.c +++ b/test/unit/bacnet/bits/src/main.c @@ -25,7 +25,11 @@ * verify support for ULL. */ +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bits, test_BIT) +#else static void test_BIT(void) +#endif { unsigned int bitpos = sizeof(unsigned int) * 8; @@ -35,7 +39,11 @@ static void test_BIT(void) } while (bitpos > 0); } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bits, test__BV) +#else static void test__BV(void) +#endif { unsigned int bitpos = sizeof(unsigned int) * 8; @@ -45,7 +53,11 @@ static void test__BV(void) } while (bitpos > 0); } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bits, test_BIT_SET) +#else static void test_BIT_SET(void) +#endif { unsigned int bitpos = sizeof(unsigned int) * 8; @@ -57,7 +69,11 @@ static void test_BIT_SET(void) } while (bitpos > 0); } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bits, test_BIT_CLEAR) +#else static void test_BIT_CLEAR(void) +#endif { unsigned int bitpos = sizeof(unsigned int) * 8; @@ -69,7 +85,11 @@ static void test_BIT_CLEAR(void) } while (bitpos > 0); } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bits, test_BIT_FLIP) +#else static void test_BIT_FLIP(void) +#endif { unsigned int bitpos = sizeof(unsigned int) * 8; @@ -90,7 +110,11 @@ static void test_BIT_FLIP(void) } while (bitpos > 0); } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bits, test_BIT_CHECK) +#else static void test_BIT_CHECK(void) +#endif { unsigned int bitpos = sizeof(unsigned int) * 8; @@ -105,7 +129,11 @@ static void test_BIT_CHECK(void) } while (bitpos > 0); } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bits, test_BITMASK_SET) +#else static void test_BITMASK_SET(void) +#endif { unsigned int bitpos = sizeof(unsigned int) * 8; @@ -117,7 +145,11 @@ static void test_BITMASK_SET(void) } while (bitpos > 0); } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bits, test_BITMASK_CLEAR) +#else static void test_BITMASK_CLEAR(void) +#endif { unsigned int bitpos = sizeof(unsigned int) * 8; @@ -129,7 +161,11 @@ static void test_BITMASK_CLEAR(void) } while (bitpos > 0); } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bits, test_BITMASK_FLIP) +#else static void test_BITMASK_FLIP(void) +#endif { unsigned int bitpos = sizeof(unsigned int) * 8; @@ -150,7 +186,11 @@ static void test_BITMASK_FLIP(void) } while (bitpos > 0); } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST(bacnet_bits, test_BITMASK_CHECK) +#else static void test_BITMASK_CHECK(void) +#endif { unsigned int bitpos = sizeof(unsigned int) * 8; @@ -165,6 +205,9 @@ static void test_BITMASK_CHECK(void) } while (bitpos > 0); } +#ifdef CONFIG_ZTEST_NEW_API +ZTEST_SUITE(bacnet_bits, NULL, NULL, NULL, NULL, NULL); +#else void test_main(void) { ztest_test_suite(bacnet_bits, @@ -181,3 +224,4 @@ void test_main(void) ); ztest_run_test_suite(bacnet_bits); } +#endif diff --git a/west.yml b/west.yml index 97cdd75a..96cb5c65 100644 --- a/west.yml +++ b/west.yml @@ -38,7 +38,7 @@ manifest: projects: - name: zephyr path: zephyr - revision: v3.4.0 + revision: v3.6.0 remote: zephyrproject-rtos west-commands: scripts/west-commands.yml import: diff --git a/zephyr/tests/bacnet/abort/CMakeLists.txt b/zephyr/tests/bacnet/abort/CMakeLists.txt index aa237e1b..d7b0670a 100644 --- a/zephyr/tests/bacnet/abort/CMakeLists.txt +++ b/zephyr/tests/bacnet/abort/CMakeLists.txt @@ -38,3 +38,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/abort/prj.conf b/zephyr/tests/bacnet/abort/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/abort/prj.conf +++ b/zephyr/tests/bacnet/abort/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/alarm_ack/CMakeLists.txt b/zephyr/tests/bacnet/alarm_ack/CMakeLists.txt index 41c510f6..2490170c 100644 --- a/zephyr/tests/bacnet/alarm_ack/CMakeLists.txt +++ b/zephyr/tests/bacnet/alarm_ack/CMakeLists.txt @@ -51,3 +51,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/alarm_ack/prj.conf b/zephyr/tests/bacnet/alarm_ack/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/alarm_ack/prj.conf +++ b/zephyr/tests/bacnet/alarm_ack/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/arf/CMakeLists.txt b/zephyr/tests/bacnet/arf/CMakeLists.txt index 41c510f6..2490170c 100644 --- a/zephyr/tests/bacnet/arf/CMakeLists.txt +++ b/zephyr/tests/bacnet/arf/CMakeLists.txt @@ -51,3 +51,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/arf/prj.conf b/zephyr/tests/bacnet/arf/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/arf/prj.conf +++ b/zephyr/tests/bacnet/arf/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/awf/CMakeLists.txt b/zephyr/tests/bacnet/awf/CMakeLists.txt index 41c510f6..2490170c 100644 --- a/zephyr/tests/bacnet/awf/CMakeLists.txt +++ b/zephyr/tests/bacnet/awf/CMakeLists.txt @@ -51,3 +51,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/awf/prj.conf b/zephyr/tests/bacnet/awf/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/awf/prj.conf +++ b/zephyr/tests/bacnet/awf/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/bacapp/CMakeLists.txt b/zephyr/tests/bacnet/bacapp/CMakeLists.txt index fa7ae3b2..a1d42d53 100644 --- a/zephyr/tests/bacnet/bacapp/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacapp/CMakeLists.txt @@ -66,3 +66,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/bacapp/prj.conf b/zephyr/tests/bacnet/bacapp/prj.conf index 2c368c18..e953d712 100644 --- a/zephyr/tests/bacnet/bacapp/prj.conf +++ b/zephyr/tests/bacnet/bacapp/prj.conf @@ -1,5 +1,4 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y CONFIG_BACAPP_PRINT_ENABLED=y CONFIG_BACAPP_SNPRINTF_ENABLED=y diff --git a/zephyr/tests/bacnet/bacdcode/CMakeLists.txt b/zephyr/tests/bacnet/bacdcode/CMakeLists.txt index 09293b85..de0c8bcc 100644 --- a/zephyr/tests/bacnet/bacdcode/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacdcode/CMakeLists.txt @@ -50,3 +50,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/bacdcode/prj.conf b/zephyr/tests/bacnet/bacdcode/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/bacdcode/prj.conf +++ b/zephyr/tests/bacnet/bacdcode/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/bacdevobjpropref/CMakeLists.txt b/zephyr/tests/bacnet/bacdevobjpropref/CMakeLists.txt index 41c510f6..2490170c 100644 --- a/zephyr/tests/bacnet/bacdevobjpropref/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacdevobjpropref/CMakeLists.txt @@ -51,3 +51,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/bacdevobjpropref/prj.conf b/zephyr/tests/bacnet/bacdevobjpropref/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/bacdevobjpropref/prj.conf +++ b/zephyr/tests/bacnet/bacdevobjpropref/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/bacerror/CMakeLists.txt b/zephyr/tests/bacnet/bacerror/CMakeLists.txt index dc75fd14..d64338da 100644 --- a/zephyr/tests/bacnet/bacerror/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacerror/CMakeLists.txt @@ -52,3 +52,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/bacerror/prj.conf b/zephyr/tests/bacnet/bacerror/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/bacerror/prj.conf +++ b/zephyr/tests/bacnet/bacerror/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/bacint/CMakeLists.txt b/zephyr/tests/bacnet/bacint/CMakeLists.txt index aa237e1b..d7b0670a 100644 --- a/zephyr/tests/bacnet/bacint/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacint/CMakeLists.txt @@ -38,3 +38,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/bacint/prj.conf b/zephyr/tests/bacnet/bacint/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/bacint/prj.conf +++ b/zephyr/tests/bacnet/bacint/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/bacpropstates/CMakeLists.txt b/zephyr/tests/bacnet/bacpropstates/CMakeLists.txt index dc75fd14..d64338da 100644 --- a/zephyr/tests/bacnet/bacpropstates/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacpropstates/CMakeLists.txt @@ -52,3 +52,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/bacpropstates/prj.conf b/zephyr/tests/bacnet/bacpropstates/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/bacpropstates/prj.conf +++ b/zephyr/tests/bacnet/bacpropstates/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/bacreal/CMakeLists.txt b/zephyr/tests/bacnet/bacreal/CMakeLists.txt index d2912ae0..dbfc9124 100644 --- a/zephyr/tests/bacnet/bacreal/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacreal/CMakeLists.txt @@ -40,3 +40,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/bacreal/prj.conf b/zephyr/tests/bacnet/bacreal/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/bacreal/prj.conf +++ b/zephyr/tests/bacnet/bacreal/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/bacstr/CMakeLists.txt b/zephyr/tests/bacnet/bacstr/CMakeLists.txt index aa237e1b..d7b0670a 100644 --- a/zephyr/tests/bacnet/bacstr/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacstr/CMakeLists.txt @@ -38,3 +38,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/bacstr/prj.conf b/zephyr/tests/bacnet/bacstr/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/bacstr/prj.conf +++ b/zephyr/tests/bacnet/bacstr/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/binding/address/CMakeLists.txt b/zephyr/tests/bacnet/basic/binding/address/CMakeLists.txt index 99877e4e..62de8d8f 100644 --- a/zephyr/tests/bacnet/basic/binding/address/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/binding/address/CMakeLists.txt @@ -53,3 +53,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/binding/address/prj.conf b/zephyr/tests/bacnet/basic/binding/address/prj.conf index 99e6adaa..79faee88 100644 --- a/zephyr/tests/bacnet/basic/binding/address/prj.conf +++ b/zephyr/tests/bacnet/basic/binding/address/prj.conf @@ -1,4 +1,3 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y CONFIG_BACNET_ADDRESS_CACHE_FILE=y diff --git a/zephyr/tests/bacnet/basic/object/acc/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/acc/CMakeLists.txt index 8f5ea077..e9595287 100644 --- a/zephyr/tests/bacnet/basic/object/acc/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/acc/CMakeLists.txt @@ -67,3 +67,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/acc/prj.conf b/zephyr/tests/bacnet/basic/object/acc/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/acc/prj.conf +++ b/zephyr/tests/bacnet/basic/object/acc/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/access_credential/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_credential/CMakeLists.txt index f5284218..0636b1ee 100644 --- a/zephyr/tests/bacnet/basic/object/access_credential/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/access_credential/CMakeLists.txt @@ -71,3 +71,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/access_credential/prj.conf b/zephyr/tests/bacnet/basic/object/access_credential/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/access_credential/prj.conf +++ b/zephyr/tests/bacnet/basic/object/access_credential/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/access_door/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_door/CMakeLists.txt index 9f6c1a31..efa33480 100644 --- a/zephyr/tests/bacnet/basic/object/access_door/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/access_door/CMakeLists.txt @@ -68,3 +68,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/access_door/prj.conf b/zephyr/tests/bacnet/basic/object/access_door/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/access_door/prj.conf +++ b/zephyr/tests/bacnet/basic/object/access_door/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/access_point/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_point/CMakeLists.txt index 8f5ea077..e9595287 100644 --- a/zephyr/tests/bacnet/basic/object/access_point/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/access_point/CMakeLists.txt @@ -67,3 +67,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/access_point/prj.conf b/zephyr/tests/bacnet/basic/object/access_point/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/access_point/prj.conf +++ b/zephyr/tests/bacnet/basic/object/access_point/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/access_rights/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_rights/CMakeLists.txt index 298a5e7d..696a769a 100644 --- a/zephyr/tests/bacnet/basic/object/access_rights/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/access_rights/CMakeLists.txt @@ -69,3 +69,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/access_rights/prj.conf b/zephyr/tests/bacnet/basic/object/access_rights/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/access_rights/prj.conf +++ b/zephyr/tests/bacnet/basic/object/access_rights/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/access_user/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_user/CMakeLists.txt index 9f6c1a31..efa33480 100644 --- a/zephyr/tests/bacnet/basic/object/access_user/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/access_user/CMakeLists.txt @@ -68,3 +68,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/access_user/prj.conf b/zephyr/tests/bacnet/basic/object/access_user/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/access_user/prj.conf +++ b/zephyr/tests/bacnet/basic/object/access_user/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/access_zone/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_zone/CMakeLists.txt index 9f6c1a31..efa33480 100644 --- a/zephyr/tests/bacnet/basic/object/access_zone/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/access_zone/CMakeLists.txt @@ -68,3 +68,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/access_zone/prj.conf b/zephyr/tests/bacnet/basic/object/access_zone/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/access_zone/prj.conf +++ b/zephyr/tests/bacnet/basic/object/access_zone/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/ai/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/ai/CMakeLists.txt index 47c9f9f0..ab136bd3 100644 --- a/zephyr/tests/bacnet/basic/object/ai/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/ai/CMakeLists.txt @@ -70,3 +70,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/ai/prj.conf b/zephyr/tests/bacnet/basic/object/ai/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/ai/prj.conf +++ b/zephyr/tests/bacnet/basic/object/ai/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/ao/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/ao/CMakeLists.txt index 9f6c1a31..efa33480 100644 --- a/zephyr/tests/bacnet/basic/object/ao/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/ao/CMakeLists.txt @@ -68,3 +68,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/ao/prj.conf b/zephyr/tests/bacnet/basic/object/ao/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/ao/prj.conf +++ b/zephyr/tests/bacnet/basic/object/ao/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/av/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/av/CMakeLists.txt index 9f6c1a31..efa33480 100644 --- a/zephyr/tests/bacnet/basic/object/av/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/av/CMakeLists.txt @@ -68,3 +68,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/av/prj.conf b/zephyr/tests/bacnet/basic/object/av/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/av/prj.conf +++ b/zephyr/tests/bacnet/basic/object/av/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/bi/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/bi/CMakeLists.txt index 9f6c1a31..efa33480 100644 --- a/zephyr/tests/bacnet/basic/object/bi/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/bi/CMakeLists.txt @@ -68,3 +68,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/bi/prj.conf b/zephyr/tests/bacnet/basic/object/bi/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/bi/prj.conf +++ b/zephyr/tests/bacnet/basic/object/bi/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/bo/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/bo/CMakeLists.txt index 102c7211..33497f88 100644 --- a/zephyr/tests/bacnet/basic/object/bo/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/bo/CMakeLists.txt @@ -79,3 +79,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/bo/prj.conf b/zephyr/tests/bacnet/basic/object/bo/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/bo/prj.conf +++ b/zephyr/tests/bacnet/basic/object/bo/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/bv/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/bv/CMakeLists.txt index 9f6c1a31..efa33480 100644 --- a/zephyr/tests/bacnet/basic/object/bv/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/bv/CMakeLists.txt @@ -68,3 +68,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/bv/prj.conf b/zephyr/tests/bacnet/basic/object/bv/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/bv/prj.conf +++ b/zephyr/tests/bacnet/basic/object/bv/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/calendar/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/calendar/CMakeLists.txt index 3a2b13e6..4a8817bb 100644 --- a/zephyr/tests/bacnet/basic/object/calendar/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/calendar/CMakeLists.txt @@ -72,3 +72,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/color_object/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/color_object/CMakeLists.txt index fe89821c..e35890b7 100644 --- a/zephyr/tests/bacnet/basic/object/color_object/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/color_object/CMakeLists.txt @@ -71,3 +71,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/color_object/prj.conf b/zephyr/tests/bacnet/basic/object/color_object/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/color_object/prj.conf +++ b/zephyr/tests/bacnet/basic/object/color_object/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/color_temperature/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/color_temperature/CMakeLists.txt index bcb2ab33..c2f6945f 100644 --- a/zephyr/tests/bacnet/basic/object/color_temperature/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/color_temperature/CMakeLists.txt @@ -71,3 +71,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/color_temperature/prj.conf b/zephyr/tests/bacnet/basic/object/color_temperature/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/color_temperature/prj.conf +++ b/zephyr/tests/bacnet/basic/object/color_temperature/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/command/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/command/CMakeLists.txt index 4725cfb8..98fd4012 100644 --- a/zephyr/tests/bacnet/basic/object/command/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/command/CMakeLists.txt @@ -77,3 +77,5 @@ else() ${TEST_OBJECT_SRC}/property_test.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/command/prj.conf b/zephyr/tests/bacnet/basic/object/command/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/command/prj.conf +++ b/zephyr/tests/bacnet/basic/object/command/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt index 339be0d2..0cd43b97 100644 --- a/zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt @@ -79,3 +79,5 @@ else() ${TEST_OBJECT_SRC}/property_test.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/credential_data_input/prj.conf b/zephyr/tests/bacnet/basic/object/credential_data_input/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/credential_data_input/prj.conf +++ b/zephyr/tests/bacnet/basic/object/credential_data_input/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/device/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/device/CMakeLists.txt index b5e1f890..6a0f9f7e 100644 --- a/zephyr/tests/bacnet/basic/object/device/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/device/CMakeLists.txt @@ -117,3 +117,5 @@ else() #${BACNET_TEST_PATH}/stubs.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/device/prj.conf b/zephyr/tests/bacnet/basic/object/device/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/device/prj.conf +++ b/zephyr/tests/bacnet/basic/object/device/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/lc/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/lc/CMakeLists.txt index 09f51a5f..319a81ca 100644 --- a/zephyr/tests/bacnet/basic/object/lc/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/lc/CMakeLists.txt @@ -74,3 +74,5 @@ else() # ${BACNET_BASE}/test/ztest/src/ztest.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/lc/prj.conf b/zephyr/tests/bacnet/basic/object/lc/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/lc/prj.conf +++ b/zephyr/tests/bacnet/basic/object/lc/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/lo/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/lo/CMakeLists.txt index 0b449e66..eaa8a753 100644 --- a/zephyr/tests/bacnet/basic/object/lo/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/lo/CMakeLists.txt @@ -71,3 +71,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/lo/prj.conf b/zephyr/tests/bacnet/basic/object/lo/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/lo/prj.conf +++ b/zephyr/tests/bacnet/basic/object/lo/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/lsp/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/lsp/CMakeLists.txt index e34aecbc..55ccb7be 100644 --- a/zephyr/tests/bacnet/basic/object/lsp/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/lsp/CMakeLists.txt @@ -69,3 +69,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/lsp/prj.conf b/zephyr/tests/bacnet/basic/object/lsp/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/lsp/prj.conf +++ b/zephyr/tests/bacnet/basic/object/lsp/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/ms-input/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/ms-input/CMakeLists.txt index 36b01749..882fcb8f 100644 --- a/zephyr/tests/bacnet/basic/object/ms-input/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/ms-input/CMakeLists.txt @@ -69,3 +69,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/ms-input/prj.conf b/zephyr/tests/bacnet/basic/object/ms-input/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/ms-input/prj.conf +++ b/zephyr/tests/bacnet/basic/object/ms-input/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/mso/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/mso/CMakeLists.txt index 9f6c1a31..efa33480 100644 --- a/zephyr/tests/bacnet/basic/object/mso/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/mso/CMakeLists.txt @@ -68,3 +68,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/mso/prj.conf b/zephyr/tests/bacnet/basic/object/mso/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/mso/prj.conf +++ b/zephyr/tests/bacnet/basic/object/mso/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/msv/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/msv/CMakeLists.txt index 2ddca523..6c8cc384 100644 --- a/zephyr/tests/bacnet/basic/object/msv/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/msv/CMakeLists.txt @@ -69,3 +69,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/msv/prj.conf b/zephyr/tests/bacnet/basic/object/msv/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/msv/prj.conf +++ b/zephyr/tests/bacnet/basic/object/msv/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt index fd19c95d..033ba922 100644 --- a/zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt @@ -79,3 +79,5 @@ else() ${TEST_OBJECT_SRC}/property_test.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/netport/prj.conf b/zephyr/tests/bacnet/basic/object/netport/prj.conf index f9c91e6b..f50998bd 100644 --- a/zephyr/tests/bacnet/basic/object/netport/prj.conf +++ b/zephyr/tests/bacnet/basic/object/netport/prj.conf @@ -1,5 +1,4 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y # BIP Options diff --git a/zephyr/tests/bacnet/basic/object/objects/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/objects/CMakeLists.txt index da1ac352..a8821a5e 100644 --- a/zephyr/tests/bacnet/basic/object/objects/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/objects/CMakeLists.txt @@ -69,3 +69,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/objects/prj.conf b/zephyr/tests/bacnet/basic/object/objects/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/objects/prj.conf +++ b/zephyr/tests/bacnet/basic/object/objects/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/osv/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/osv/CMakeLists.txt index 9f6c1a31..efa33480 100644 --- a/zephyr/tests/bacnet/basic/object/osv/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/osv/CMakeLists.txt @@ -68,3 +68,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/osv/prj.conf b/zephyr/tests/bacnet/basic/object/osv/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/osv/prj.conf +++ b/zephyr/tests/bacnet/basic/object/osv/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/piv/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/piv/CMakeLists.txt index 9f6c1a31..efa33480 100644 --- a/zephyr/tests/bacnet/basic/object/piv/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/piv/CMakeLists.txt @@ -68,3 +68,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/piv/prj.conf b/zephyr/tests/bacnet/basic/object/piv/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/piv/prj.conf +++ b/zephyr/tests/bacnet/basic/object/piv/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt index 21f36543..76721db5 100644 --- a/zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt @@ -78,3 +78,5 @@ else() ${TEST_OBJECT_SRC}/property_test.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/object/schedule/prj.conf b/zephyr/tests/bacnet/basic/object/schedule/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/object/schedule/prj.conf +++ b/zephyr/tests/bacnet/basic/object/schedule/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/object/time_value/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/time_value/CMakeLists.txt index 3a2b13e6..4a8817bb 100644 --- a/zephyr/tests/bacnet/basic/object/time_value/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/time_value/CMakeLists.txt @@ -72,3 +72,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/sys/fifo/CMakeLists.txt b/zephyr/tests/bacnet/basic/sys/fifo/CMakeLists.txt index aa237e1b..d7b0670a 100644 --- a/zephyr/tests/bacnet/basic/sys/fifo/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/sys/fifo/CMakeLists.txt @@ -38,3 +38,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/sys/fifo/prj.conf b/zephyr/tests/bacnet/basic/sys/fifo/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/sys/fifo/prj.conf +++ b/zephyr/tests/bacnet/basic/sys/fifo/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/sys/filename/CMakeLists.txt b/zephyr/tests/bacnet/basic/sys/filename/CMakeLists.txt index aa237e1b..d7b0670a 100644 --- a/zephyr/tests/bacnet/basic/sys/filename/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/sys/filename/CMakeLists.txt @@ -38,3 +38,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/sys/filename/prj.conf b/zephyr/tests/bacnet/basic/sys/filename/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/sys/filename/prj.conf +++ b/zephyr/tests/bacnet/basic/sys/filename/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/sys/key/CMakeLists.txt b/zephyr/tests/bacnet/basic/sys/key/CMakeLists.txt index 1df52874..2e4dcd27 100644 --- a/zephyr/tests/bacnet/basic/sys/key/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/sys/key/CMakeLists.txt @@ -37,3 +37,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/sys/key/prj.conf b/zephyr/tests/bacnet/basic/sys/key/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/sys/key/prj.conf +++ b/zephyr/tests/bacnet/basic/sys/key/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/sys/keylist/CMakeLists.txt b/zephyr/tests/bacnet/basic/sys/keylist/CMakeLists.txt index aa237e1b..d7b0670a 100644 --- a/zephyr/tests/bacnet/basic/sys/keylist/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/sys/keylist/CMakeLists.txt @@ -38,3 +38,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/sys/keylist/prj.conf b/zephyr/tests/bacnet/basic/sys/keylist/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/sys/keylist/prj.conf +++ b/zephyr/tests/bacnet/basic/sys/keylist/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/sys/ringbuf/CMakeLists.txt b/zephyr/tests/bacnet/basic/sys/ringbuf/CMakeLists.txt index aa237e1b..d7b0670a 100644 --- a/zephyr/tests/bacnet/basic/sys/ringbuf/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/sys/ringbuf/CMakeLists.txt @@ -38,3 +38,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/sys/ringbuf/prj.conf b/zephyr/tests/bacnet/basic/sys/ringbuf/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/sys/ringbuf/prj.conf +++ b/zephyr/tests/bacnet/basic/sys/ringbuf/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/basic/sys/sbuf/CMakeLists.txt b/zephyr/tests/bacnet/basic/sys/sbuf/CMakeLists.txt index aa237e1b..d7b0670a 100644 --- a/zephyr/tests/bacnet/basic/sys/sbuf/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/sys/sbuf/CMakeLists.txt @@ -38,3 +38,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/basic/sys/sbuf/prj.conf b/zephyr/tests/bacnet/basic/sys/sbuf/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/basic/sys/sbuf/prj.conf +++ b/zephyr/tests/bacnet/basic/sys/sbuf/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/cov/CMakeLists.txt b/zephyr/tests/bacnet/cov/CMakeLists.txt index 0814b8e9..fb72f59d 100644 --- a/zephyr/tests/bacnet/cov/CMakeLists.txt +++ b/zephyr/tests/bacnet/cov/CMakeLists.txt @@ -68,3 +68,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/cov/prj.conf b/zephyr/tests/bacnet/cov/prj.conf index 2c368c18..e953d712 100644 --- a/zephyr/tests/bacnet/cov/prj.conf +++ b/zephyr/tests/bacnet/cov/prj.conf @@ -1,5 +1,4 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y CONFIG_BACAPP_PRINT_ENABLED=y CONFIG_BACAPP_SNPRINTF_ENABLED=y diff --git a/zephyr/tests/bacnet/datalink/bvlc/CMakeLists.txt b/zephyr/tests/bacnet/datalink/bvlc/CMakeLists.txt index f40f4f80..ed92b061 100644 --- a/zephyr/tests/bacnet/datalink/bvlc/CMakeLists.txt +++ b/zephyr/tests/bacnet/datalink/bvlc/CMakeLists.txt @@ -66,3 +66,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/datalink/bvlc/prj.conf b/zephyr/tests/bacnet/datalink/bvlc/prj.conf index 07a9e3bf..ca120096 100644 --- a/zephyr/tests/bacnet/datalink/bvlc/prj.conf +++ b/zephyr/tests/bacnet/datalink/bvlc/prj.conf @@ -1,5 +1,4 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y # BIP Options diff --git a/zephyr/tests/bacnet/datalink/cobs/CMakeLists.txt b/zephyr/tests/bacnet/datalink/cobs/CMakeLists.txt index dd8052bf..1adc3052 100644 --- a/zephyr/tests/bacnet/datalink/cobs/CMakeLists.txt +++ b/zephyr/tests/bacnet/datalink/cobs/CMakeLists.txt @@ -44,3 +44,5 @@ else() ${BACNET_DATALINK_SRC}/cobs.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/datalink/cobs/prj.conf b/zephyr/tests/bacnet/datalink/cobs/prj.conf index 54d5402e..65f15a6f 100644 --- a/zephyr/tests/bacnet/datalink/cobs/prj.conf +++ b/zephyr/tests/bacnet/datalink/cobs/prj.conf @@ -1,4 +1,3 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y CONFIG_BACDL_MSTP=y diff --git a/zephyr/tests/bacnet/datalink/crc/CMakeLists.txt b/zephyr/tests/bacnet/datalink/crc/CMakeLists.txt index cf89af43..29b1b81e 100644 --- a/zephyr/tests/bacnet/datalink/crc/CMakeLists.txt +++ b/zephyr/tests/bacnet/datalink/crc/CMakeLists.txt @@ -40,3 +40,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/datalink/crc/prj.conf b/zephyr/tests/bacnet/datalink/crc/prj.conf index 54d5402e..65f15a6f 100644 --- a/zephyr/tests/bacnet/datalink/crc/prj.conf +++ b/zephyr/tests/bacnet/datalink/crc/prj.conf @@ -1,4 +1,3 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y CONFIG_BACDL_MSTP=y diff --git a/zephyr/tests/bacnet/datalink/mock/CMakeLists.txt b/zephyr/tests/bacnet/datalink/mock/CMakeLists.txt index 1642ffe9..766b17ac 100644 --- a/zephyr/tests/bacnet/datalink/mock/CMakeLists.txt +++ b/zephyr/tests/bacnet/datalink/mock/CMakeLists.txt @@ -53,3 +53,5 @@ else() ${SRC_TEST} ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/datalink/mock/prj.conf b/zephyr/tests/bacnet/datalink/mock/prj.conf index 8b165a4a..2931ee69 100644 --- a/zephyr/tests/bacnet/datalink/mock/prj.conf +++ b/zephyr/tests/bacnet/datalink/mock/prj.conf @@ -1,5 +1,4 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_ZTEST_MOCKING=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/datetime/CMakeLists.txt b/zephyr/tests/bacnet/datetime/CMakeLists.txt index 666a7e61..237e6fac 100644 --- a/zephyr/tests/bacnet/datetime/CMakeLists.txt +++ b/zephyr/tests/bacnet/datetime/CMakeLists.txt @@ -50,3 +50,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/datetime/prj.conf b/zephyr/tests/bacnet/datetime/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/datetime/prj.conf +++ b/zephyr/tests/bacnet/datetime/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/dcc/CMakeLists.txt b/zephyr/tests/bacnet/dcc/CMakeLists.txt index 41c510f6..2490170c 100644 --- a/zephyr/tests/bacnet/dcc/CMakeLists.txt +++ b/zephyr/tests/bacnet/dcc/CMakeLists.txt @@ -51,3 +51,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/dcc/prj.conf b/zephyr/tests/bacnet/dcc/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/dcc/prj.conf +++ b/zephyr/tests/bacnet/dcc/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/event/CMakeLists.txt b/zephyr/tests/bacnet/event/CMakeLists.txt index 0e7156fc..29c88220 100644 --- a/zephyr/tests/bacnet/event/CMakeLists.txt +++ b/zephyr/tests/bacnet/event/CMakeLists.txt @@ -68,3 +68,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/event/prj.conf b/zephyr/tests/bacnet/event/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/event/prj.conf +++ b/zephyr/tests/bacnet/event/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/getevent/CMakeLists.txt b/zephyr/tests/bacnet/getevent/CMakeLists.txt index 41c510f6..2490170c 100644 --- a/zephyr/tests/bacnet/getevent/CMakeLists.txt +++ b/zephyr/tests/bacnet/getevent/CMakeLists.txt @@ -51,3 +51,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/getevent/prj.conf b/zephyr/tests/bacnet/getevent/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/getevent/prj.conf +++ b/zephyr/tests/bacnet/getevent/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/iam/CMakeLists.txt b/zephyr/tests/bacnet/iam/CMakeLists.txt index 41c510f6..2490170c 100644 --- a/zephyr/tests/bacnet/iam/CMakeLists.txt +++ b/zephyr/tests/bacnet/iam/CMakeLists.txt @@ -51,3 +51,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/iam/prj.conf b/zephyr/tests/bacnet/iam/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/iam/prj.conf +++ b/zephyr/tests/bacnet/iam/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/ihave/CMakeLists.txt b/zephyr/tests/bacnet/ihave/CMakeLists.txt index 41c510f6..2490170c 100644 --- a/zephyr/tests/bacnet/ihave/CMakeLists.txt +++ b/zephyr/tests/bacnet/ihave/CMakeLists.txt @@ -51,3 +51,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/ihave/prj.conf b/zephyr/tests/bacnet/ihave/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/ihave/prj.conf +++ b/zephyr/tests/bacnet/ihave/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/indtext/CMakeLists.txt b/zephyr/tests/bacnet/indtext/CMakeLists.txt index aa237e1b..d7b0670a 100644 --- a/zephyr/tests/bacnet/indtext/CMakeLists.txt +++ b/zephyr/tests/bacnet/indtext/CMakeLists.txt @@ -38,3 +38,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/indtext/prj.conf b/zephyr/tests/bacnet/indtext/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/indtext/prj.conf +++ b/zephyr/tests/bacnet/indtext/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/lighting/CMakeLists.txt b/zephyr/tests/bacnet/lighting/CMakeLists.txt index 4f1b6256..ffc0cce2 100644 --- a/zephyr/tests/bacnet/lighting/CMakeLists.txt +++ b/zephyr/tests/bacnet/lighting/CMakeLists.txt @@ -53,3 +53,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/lighting/prj.conf b/zephyr/tests/bacnet/lighting/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/lighting/prj.conf +++ b/zephyr/tests/bacnet/lighting/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/lso/CMakeLists.txt b/zephyr/tests/bacnet/lso/CMakeLists.txt index 41c510f6..2490170c 100644 --- a/zephyr/tests/bacnet/lso/CMakeLists.txt +++ b/zephyr/tests/bacnet/lso/CMakeLists.txt @@ -51,3 +51,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/lso/prj.conf b/zephyr/tests/bacnet/lso/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/lso/prj.conf +++ b/zephyr/tests/bacnet/lso/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/memcopy/CMakeLists.txt b/zephyr/tests/bacnet/memcopy/CMakeLists.txt index aa237e1b..d7b0670a 100644 --- a/zephyr/tests/bacnet/memcopy/CMakeLists.txt +++ b/zephyr/tests/bacnet/memcopy/CMakeLists.txt @@ -38,3 +38,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/memcopy/prj.conf b/zephyr/tests/bacnet/memcopy/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/memcopy/prj.conf +++ b/zephyr/tests/bacnet/memcopy/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/npdu/CMakeLists.txt b/zephyr/tests/bacnet/npdu/CMakeLists.txt index 17e85293..1ee0e845 100644 --- a/zephyr/tests/bacnet/npdu/CMakeLists.txt +++ b/zephyr/tests/bacnet/npdu/CMakeLists.txt @@ -45,3 +45,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/npdu/prj.conf b/zephyr/tests/bacnet/npdu/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/npdu/prj.conf +++ b/zephyr/tests/bacnet/npdu/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/property/CMakeLists.txt b/zephyr/tests/bacnet/property/CMakeLists.txt index be400d31..57abe7e0 100644 --- a/zephyr/tests/bacnet/property/CMakeLists.txt +++ b/zephyr/tests/bacnet/property/CMakeLists.txt @@ -54,3 +54,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/property/prj.conf b/zephyr/tests/bacnet/property/prj.conf index b87f648a..3cb7c121 100644 --- a/zephyr/tests/bacnet/property/prj.conf +++ b/zephyr/tests/bacnet/property/prj.conf @@ -1,4 +1,3 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y CONFIG_BACNET_PROPERTY_LISTS=y diff --git a/zephyr/tests/bacnet/ptransfer/CMakeLists.txt b/zephyr/tests/bacnet/ptransfer/CMakeLists.txt index 9ae7e141..f2f21d01 100644 --- a/zephyr/tests/bacnet/ptransfer/CMakeLists.txt +++ b/zephyr/tests/bacnet/ptransfer/CMakeLists.txt @@ -67,3 +67,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/ptransfer/prj.conf b/zephyr/tests/bacnet/ptransfer/prj.conf index 2c368c18..e953d712 100644 --- a/zephyr/tests/bacnet/ptransfer/prj.conf +++ b/zephyr/tests/bacnet/ptransfer/prj.conf @@ -1,5 +1,4 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y CONFIG_BACAPP_PRINT_ENABLED=y CONFIG_BACAPP_SNPRINTF_ENABLED=y diff --git a/zephyr/tests/bacnet/rd/CMakeLists.txt b/zephyr/tests/bacnet/rd/CMakeLists.txt index 751a643e..346e606b 100644 --- a/zephyr/tests/bacnet/rd/CMakeLists.txt +++ b/zephyr/tests/bacnet/rd/CMakeLists.txt @@ -48,3 +48,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/rd/prj.conf b/zephyr/tests/bacnet/rd/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/rd/prj.conf +++ b/zephyr/tests/bacnet/rd/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/reject/CMakeLists.txt b/zephyr/tests/bacnet/reject/CMakeLists.txt index aa237e1b..d7b0670a 100644 --- a/zephyr/tests/bacnet/reject/CMakeLists.txt +++ b/zephyr/tests/bacnet/reject/CMakeLists.txt @@ -38,3 +38,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/reject/prj.conf b/zephyr/tests/bacnet/reject/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/reject/prj.conf +++ b/zephyr/tests/bacnet/reject/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/rp/CMakeLists.txt b/zephyr/tests/bacnet/rp/CMakeLists.txt index 751a643e..346e606b 100644 --- a/zephyr/tests/bacnet/rp/CMakeLists.txt +++ b/zephyr/tests/bacnet/rp/CMakeLists.txt @@ -48,3 +48,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/rp/prj.conf b/zephyr/tests/bacnet/rp/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/rp/prj.conf +++ b/zephyr/tests/bacnet/rp/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/rpm/CMakeLists.txt b/zephyr/tests/bacnet/rpm/CMakeLists.txt index df87cbf1..26afcd20 100644 --- a/zephyr/tests/bacnet/rpm/CMakeLists.txt +++ b/zephyr/tests/bacnet/rpm/CMakeLists.txt @@ -67,3 +67,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/rpm/prj.conf b/zephyr/tests/bacnet/rpm/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/rpm/prj.conf +++ b/zephyr/tests/bacnet/rpm/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/timestamp/CMakeLists.txt b/zephyr/tests/bacnet/timestamp/CMakeLists.txt index cec92878..899036d3 100644 --- a/zephyr/tests/bacnet/timestamp/CMakeLists.txt +++ b/zephyr/tests/bacnet/timestamp/CMakeLists.txt @@ -50,3 +50,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/timestamp/prj.conf b/zephyr/tests/bacnet/timestamp/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/timestamp/prj.conf +++ b/zephyr/tests/bacnet/timestamp/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/timesync/CMakeLists.txt b/zephyr/tests/bacnet/timesync/CMakeLists.txt index 41c510f6..2490170c 100644 --- a/zephyr/tests/bacnet/timesync/CMakeLists.txt +++ b/zephyr/tests/bacnet/timesync/CMakeLists.txt @@ -51,3 +51,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/timesync/prj.conf b/zephyr/tests/bacnet/timesync/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/timesync/prj.conf +++ b/zephyr/tests/bacnet/timesync/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/whohas/CMakeLists.txt b/zephyr/tests/bacnet/whohas/CMakeLists.txt index 751a643e..346e606b 100644 --- a/zephyr/tests/bacnet/whohas/CMakeLists.txt +++ b/zephyr/tests/bacnet/whohas/CMakeLists.txt @@ -48,3 +48,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/whohas/prj.conf b/zephyr/tests/bacnet/whohas/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/whohas/prj.conf +++ b/zephyr/tests/bacnet/whohas/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/whois/CMakeLists.txt b/zephyr/tests/bacnet/whois/CMakeLists.txt index 751a643e..346e606b 100644 --- a/zephyr/tests/bacnet/whois/CMakeLists.txt +++ b/zephyr/tests/bacnet/whois/CMakeLists.txt @@ -48,3 +48,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/whois/prj.conf b/zephyr/tests/bacnet/whois/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/whois/prj.conf +++ b/zephyr/tests/bacnet/whois/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/bacnet/wp/CMakeLists.txt b/zephyr/tests/bacnet/wp/CMakeLists.txt index 89af7d7d..e683b357 100644 --- a/zephyr/tests/bacnet/wp/CMakeLists.txt +++ b/zephyr/tests/bacnet/wp/CMakeLists.txt @@ -65,3 +65,5 @@ else() ${BACNET_TEST_PATH}/src/main.c ) endif() + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig diff --git a/zephyr/tests/bacnet/wp/prj.conf b/zephyr/tests/bacnet/wp/prj.conf index 2e57da36..7c43f2ec 100644 --- a/zephyr/tests/bacnet/wp/prj.conf +++ b/zephyr/tests/bacnet/wp/prj.conf @@ -1,3 +1,2 @@ CONFIG_ZTEST=y -CONFIG_ZTEST_NEW_API=y CONFIG_BACNETSTACK=y diff --git a/zephyr/tests/unit/bacnet/bits/CMakeLists.txt b/zephyr/tests/unit/bacnet/bits/CMakeLists.txt index 7e2d817d..0036193c 100644 --- a/zephyr/tests/unit/bacnet/bits/CMakeLists.txt +++ b/zephyr/tests/unit/bacnet/bits/CMakeLists.txt @@ -24,3 +24,5 @@ find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE}) target_include_directories(testbinary PRIVATE ${ZEPHYR_CURRENT_MODULE_DIR}/src ) + +add_compile_definitions(CONFIG_ZTEST_NEW_API) # For exposing deprecated Kconfig