[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:
Greg Shue
2023-01-18 08:50:31 -08:00
committed by GitHub
parent 1a7a810f1a
commit eb36033fd8
262 changed files with 580 additions and 285 deletions
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/abort.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/alarm_ack.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/arf.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/awf.h>
/**
+1 -1
View File
@@ -10,7 +10,7 @@
#include <stdint.h>
#include <string.h>
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/bacdcode.h>
#include <bacnet/bacapp.h>
#include <bacnet/bactext.h>
+1 -1
View File
@@ -9,7 +9,7 @@
*/
#include <ctype.h> /* For isprint */
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/bacdcode.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/bacdcode.h>
#include <bacnet/bacdevobjpropref.h>
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/bacerror.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/bacint.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/bacpropstates.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet real value encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/bacreal.h>
#include <bacnet/bacdef.h>
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/bacstr.h>
/**
+1 -1
View File
@@ -13,7 +13,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <ztest.h>
#include <zephyr/ztest.h>
#include "bacnet/bactimevalue.h"
#include "bacnet/datetime.h"
#include "bacnet/bacapp.h"
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/bacaddr.h>
#include <bacnet/basic/binding/address.h>
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/acc.h>
#include <bacnet/bactext.h>
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/access_credential.h>
/**
@@ -8,7 +8,7 @@
* @brief test BACnet access_door object APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/access_door.h>
/**
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/access_point.h>
/**
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/access_rights.h>
/**
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/access_user.h>
/**
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/access_zone.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/ai.h>
#include <bacnet/bactext.h>
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/ao.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/av.h>
/**
+1 -1
View File
@@ -9,7 +9,7 @@
*
* SPDX-License-Identifier: MIT
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/bacfile.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/bi.h>
#include <bacnet/bactext.h>
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/bo.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/bv.h>
/**
@@ -6,7 +6,7 @@
*
* SPDX-License-Identifier: MIT
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/bactext.h>
#include <bacnet/basic/object/color_object.h>
@@ -6,7 +6,7 @@
*
* SPDX-License-Identifier: MIT
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/bactext.h>
#include <bacnet/basic/object/color_temperature.h>
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet command object APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/command.h>
/**
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/credential_data_input.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/device.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet load control object
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/bacdcode.h>
#include <bacnet/bacstr.h>
#include <bacnet/basic/object/ao.h>
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/bactext.h>
#include <bacnet/basic/object/lo.h>
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/lsp.h>
/**
+1 -1
View File
@@ -6,7 +6,7 @@
*
* SPDX-License-Identifier: MIT
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/service/h_apdu.h>
uint16_t apdu_decode_confirmed_service_request(
+1 -1
View File
@@ -6,7 +6,7 @@
*
* SPDX-License-Identifier: MIT
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/bactext.h>
#include <bacnet/basic/object/device.h>
+1 -1
View File
@@ -6,7 +6,7 @@
*
* SPDX-License-Identifier: MIT
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/tsm/tsm.h>
bool tsm_get_transaction_pdu(
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/ms-input.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/mso.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/msv.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/readrange.h>
#include <bacnet/basic/object/netport.h>
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/sys/keylist.h>
#include <bacnet/basic/object/objects.h>
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/osv.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/piv.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/object/schedule.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
*
* SPDX-License-Identifier: MIT
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/sys/color_rgb.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/sys/days.h>
/**
+1 -1
View File
@@ -9,7 +9,7 @@
*/
#include <limits.h>
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/sys/fifo.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/sys/filename.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/sys/keylist.h>
/**
+1 -1
View File
@@ -9,7 +9,7 @@
*/
#include <limits.h>
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/sys/ringbuf.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/basic/sys/sbuf.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
//#include <bacnet/bacapp.h>
#include <bacnet/cov.h>
+1 -1
View File
@@ -9,7 +9,7 @@
*/
#include <stdlib.h> /* For calloc() */
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/bactext.h>
#include <bacnet/datalink/bvlc.h>
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet COBS encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <stdlib.h>
#include <bacnet/datalink/cobs.h>
#include <bacnet/bytes.h>
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/datalink/crc.h>
#include <bacnet/bytes.h>
+1 -1
View File
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <stdint.h>
#include "bacnet/datalink/arcnet.h"
+1 -1
View File
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <stdint.h> /* for standard integer types uint8_t etc. */
#include <stdbool.h> /* for the standard bool type. */
#include <stdio.h>
+1 -1
View File
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h> /* for standard integer types uint8_t etc. */
+1 -1
View File
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <stdio.h>
#include <stdlib.h>
#include "bacnet/datalink/dlmstp.h"
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <stdio.h>
#include <stdlib.h>
#include "bacnet/datalink/ethernet.h"
+1 -1
View File
@@ -9,7 +9,7 @@
*/
#include <stdlib.h> /* For calloc() */
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/datalink/datalink.h>
#include "bacnet/apdu.h"
+1 -1
View File
@@ -42,7 +42,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <ztest.h>
#include <zephyr/ztest.h>
#include "bacnet/datetime.h"
#include "bacnet/bacdcode.h"
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/dcc.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/event.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet service GetAlarmSummary encode and decode
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/get_alarm_sum.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/getevent.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/iam.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/ihave.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/indtext.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/bacdef.h>
#include <bacnet/lighting.h>
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/lso.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/memcopy.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/npdu.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/property.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/bacapp.h>
#include <bacnet/bacenum.h>
#include <bacnet/ptransfer.h>
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/bacstr.h>
#include <bacnet/rd.h>
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/reject.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/bacdcode.h>
#include <bacnet/rp.h>
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/bacerror.h> /* For bacerror_decode_error_class_and_code() */
#include <bacnet/bacdcode.h>
#include <bacnet/rpm.h>
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/timestamp.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/datetime.h>
#include <bacnet/timesync.h>
+1 -1
View File
@@ -13,7 +13,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <ztest.h>
#include <zephyr/ztest.h>
#include "bacnet/bactimevalue.h"
#include "bacnet/weeklyschedule.h"
#include "bacnet/dailyschedule.h"
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/whohas.h>
/**
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/bacdef.h>
#include <bacnet/whois.h>
+1 -1
View File
@@ -8,7 +8,7 @@
* @brief test BACnet integer encode/decode APIs
*/
#include <ztest.h>
#include <zephyr/ztest.h>
#include <bacnet/wp.h>
/**