riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests/gnrc_netif: fix NDEBUG compile problem

Browse Source
This commit is contained in:
Gunar Schorcht 2020-02-25 09:28:58 +01:00
parent 1757d5eae0
commit c7fdb5eeba
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/gnrc_netif/common.c
View File

@ -23,6 +23,7 @@
#include "net/ipv6.h"
#include "net/netdev_test.h"
#include "od.h"
#include "test_utils/expect.h"
static netdev_test_t _devs[GNRC_NETIF_NUMOF];
@ -72,7 +73,7 @@ void _test_trigger_recv(gnrc_netif_t *netif, const uint8_t *data,
{
netdev_t *dev = netif->dev;
assert(data_len <= ETHERNET_DATA_LEN);
expect(data_len <= ETHERNET_DATA_LEN);
if ((data != NULL) || (data_len > 0)) {
tmp_buffer_bytes = data_len;
memcpy(tmp_buffer, data, data_len);
@ -80,7 +81,7 @@ void _test_trigger_recv(gnrc_netif_t *netif, const uint8_t *data,
else {
tmp_buffer_bytes = 0;
}
assert(dev->event_callback);
expect(dev->event_callback);
netdev_trigger_event_isr(dev);
}
@ -106,13 +107,13 @@ static int _netdev_recv(netdev_t *dev, char *buf, int len, void *info)
static void _netdev_isr(netdev_t *dev)
{
assert(dev->event_callback);
expect(dev->event_callback);
dev->event_callback(dev, NETDEV_EVENT_RX_COMPLETE);
}
static int _get_netdev_device_type(netdev_t *netdev, void *value, size_t max_len)
{
assert(max_len == sizeof(uint16_t));
expect(max_len == sizeof(uint16_t));
(void)max_len;
netdev_test_t *dev = (netdev_test_t *)netdev;
@ -131,15 +132,15 @@ static int _get_netdev_device_type(netdev_t *netdev, void *value, size_t max_len
static int _get_netdev_proto(netdev_t *dev, void *value, size_t max_len)
{
assert(dev == ieee802154_dev);
assert(max_len == sizeof(gnrc_nettype_t));
expect(dev == ieee802154_dev);
expect(max_len == sizeof(gnrc_nettype_t));
*((gnrc_nettype_t *)value) = GNRC_NETTYPE_UNDEF;
return sizeof(gnrc_nettype_t);
}
static int _get_netdev_max_packet_size(netdev_t *netdev, void *value, size_t max_len)
{
assert(max_len == sizeof(uint16_t));
expect(max_len == sizeof(uint16_t));
(void)max_len;
netdev_test_t *dev = (netdev_test_t *)netdev;

17
tests/gnrc_netif/main.c
View File

@ -35,6 +35,7 @@
#include "net/gnrc/netif/internal.h"
#include "net/netdev_test.h"
#include "net/netif.h"
#include "test_utils/expect.h"
#include "utlist.h"
#include "xtimer.h"
@ -1669,12 +1670,12 @@ static int _get_netdev_address(netdev_t *dev, void *value, size_t max_len)
(void)max_len;
if (dev == ethernet_dev) {
assert(max_len >= sizeof(ethernet_l2addr));
expect(max_len >= sizeof(ethernet_l2addr));
memcpy(value, ethernet_l2addr, sizeof(ethernet_l2addr));
return sizeof(ethernet_l2addr);
}
else if (dev == ieee802154_dev) {
assert(max_len >= sizeof(ieee802154_l2addr_short));
expect(max_len >= sizeof(ieee802154_l2addr_short));
memcpy(value, ieee802154_l2addr_short, sizeof(ieee802154_l2addr_short));
return sizeof(ieee802154_l2addr_short);
}
@ -1685,12 +1686,12 @@ static int _set_netdev_address(netdev_t *dev, const void *value,
size_t value_len)
{
if (dev == ethernet_dev) {
assert(value_len <= sizeof(ethernet_l2addr));
expect(value_len <= sizeof(ethernet_l2addr));
memcpy(ethernet_l2addr, value, value_len);
return value_len;
}
else if (dev == ieee802154_dev) {
assert(value_len <= sizeof(ieee802154_l2addr_short));
expect(value_len <= sizeof(ieee802154_l2addr_short));
memcpy(ieee802154_l2addr_short, value, value_len);
return value_len;
}
@ -1702,7 +1703,7 @@ static int _get_netdev_address_long(netdev_t *dev, void *value, size_t max_len)
(void)max_len;
if (dev == ieee802154_dev) {
assert(max_len >= sizeof(ieee802154_l2addr_long));
expect(max_len >= sizeof(ieee802154_l2addr_long));
memcpy(value, ieee802154_l2addr_long, sizeof(ieee802154_l2addr_long));
return sizeof(ieee802154_l2addr_long);
}
@ -1713,7 +1714,7 @@ static int _set_netdev_address_long(netdev_t *dev, const void *value,
size_t value_len)
{
if (dev == ieee802154_dev) {
assert(value_len <= sizeof(ieee802154_l2addr_long));
expect(value_len <= sizeof(ieee802154_l2addr_long));
memcpy(ieee802154_l2addr_long, value, value_len);
return value_len;
}
@ -1725,7 +1726,7 @@ static int _get_netdev_src_len(netdev_t *dev, void *value, size_t max_len)
(void)max_len;
if (dev == ieee802154_dev) {
assert(max_len == sizeof(uint16_t));
expect(max_len == sizeof(uint16_t));
*((uint16_t *)value) = ieee802154_l2addr_len;
return sizeof(uint16_t);
}
@ -1738,7 +1739,7 @@ static int _set_netdev_src_len(netdev_t *dev, const void *value,
(void)value_len;
if (dev == ieee802154_dev) {
assert(value_len == sizeof(uint16_t));
expect(value_len == sizeof(uint16_t));
ieee802154_l2addr_len = *((uint16_t *)value);
return sizeof(uint16_t);
}