Merge pull request #21649 from gschorcht/fix_ndebug_problems

gschorcht · web-flow · commit 42f576949950 · 2025-08-13T17:53:40.000Z
tests: fix compilation problems with NDEBUG
diff --git a/cpu/esp32/periph/i2c_hw.c b/cpu/esp32/periph/i2c_hw.c
@@ -171,6 +171,7 @@ void i2c_init(i2c_t dev)
         default:
             LOG_TAG_ERROR("i2c", "Invalid speed value in %s\n", __func__);
             assert(0);
+            return;
     }
 
     _i2c_bus[dev].clk_freq = clk_speed;
diff --git a/cpu/rpx0xx/periph/pwm.c b/cpu/rpx0xx/periph/pwm.c
@@ -112,6 +112,7 @@ uint32_t pwm_init(pwm_t pwm, pwm_mode_t mode, uint32_t freq, uint16_t res)
 
 uint8_t pwm_channels(pwm_t pwm)
 {
+    (void)pwm;  /* avoid compilation problems with NDEBUG */
     assert(pwm < PWM_NUMOF);
     return PWM_CHANNEL_NUMOF;
 }
diff --git a/drivers/cst816s/cst816s_touch_dev.c b/drivers/cst816s/cst816s_touch_dev.c
@@ -43,6 +43,7 @@ uint16_t _cst816s_height(const touch_dev_t *touch_dev)
 {
     const cst816s_t *dev = (const cst816s_t *)touch_dev;
     assert(dev);
+    (void)dev;  /* avoid compilation problems with NDEBUG */
 
     return CST816S_YMAX;
 }
@@ -51,6 +52,7 @@ uint16_t _cst816s_width(const touch_dev_t *touch_dev)
 {
     const cst816s_t *dev = (const cst816s_t *)touch_dev;
     assert(dev);
+    (void)dev;  /* avoid compilation problems with NDEBUG */
 
     return CST816S_XMAX;
 }
diff --git a/drivers/soft_spi/soft_spi.c b/drivers/soft_spi/soft_spi.c
@@ -101,6 +101,7 @@ int soft_spi_init_cs(soft_spi_t bus, soft_spi_cs_t cs)
     return SOFT_SPI_OK;
 }
 
+MAYBE_UNUSED
 static inline int soft_spi_mode_is_valid(soft_spi_mode_t mode)
 {
     if ((mode != SOFT_SPI_MODE_0) && (mode != SOFT_SPI_MODE_1) &&
diff --git a/drivers/ws281x/esp32.c b/drivers/ws281x/esp32.c
@@ -64,6 +64,7 @@ static uint8_t _rmt_channel(ws281x_t *dev)
         }
     }
     assert(0);
+    return 0;   /* avoid compilation problems with NDEBUG */
 }
 #endif
 
diff --git a/pkg/cifra/psa_cifra/aes_ccm.c b/pkg/cifra/psa_cifra/aes_ccm.c
@@ -28,7 +28,8 @@ psa_status_t psa_aead_encrypt_aes_ccm(const psa_key_attributes_t *attributes,
                                       size_t nonce_length, const uint8_t *additional_data,
                                       size_t additional_data_length, const uint8_t *plaintext,
                                       size_t plaintext_length, uint8_t *ciphertext,
-                                      size_t ciphertext_size, size_t *ciphertext_length)
+                                      MAYBE_UNUSED size_t ciphertext_size,
+                                      size_t *ciphertext_length)
 {
     (void)attributes;
     /* This should already have been checked by PSA. */
diff --git a/pkg/driver_cryptocell_310/psa_cryptocell_310/aes_ccm.c b/pkg/driver_cryptocell_310/psa_cryptocell_310/aes_ccm.c
@@ -38,6 +38,7 @@ psa_status_t psa_aead_aes_128_ccm_encrypt(const psa_key_attributes_t *attributes
     (void)key_buffer_length;
     /* This should already have been checked by PSA. */
     assert(ciphertext_size >= plaintext_length + tag_length);
+    (void)ciphertext_size;  /* avoid compilation problems with NDEBUG */
 
     if (!cryptocell_310_data_within_ram(nonce) ||
         !cryptocell_310_data_within_ram(key_buffer) ||
diff --git a/pkg/tinyvcdiff/contrib/tinyvcdiff_mtd/mtd.c b/pkg/tinyvcdiff/contrib/tinyvcdiff_mtd/mtd.c
@@ -99,6 +99,7 @@ static int _write (void *dev, uint8_t *src, size_t offset, size_t len)
     vcdiff_mtd_t *mtd = dev;
 
     assert(offset == mtd->offset);
+    (void)offset;   /* avoid compilation problems with NDEBUG */
 
     DEBUG("_write: 0x%" PRIxSIZE " + %" PRIuSIZE "B\n", mtd->offset, len);
 
diff --git a/pkg/uwb-core/Makefile b/pkg/uwb-core/Makefile
@@ -24,6 +24,10 @@ ifneq (,$(filter llvm,$(TOOLCHAIN)))
   CFLAGS += -Wno-microsoft-anon-tag
 endif
 
+ifneq (,$(filter -DNDEBUG,$(CFLAGS)))
+  CFLAGS += -Wno-sometimes-uninitialized
+endif
+
 IGNORE_MODULES := uwb-core_dpl \
                   uwb-core_config \
                   uwb-core_contrib \
diff --git a/pkg/uwb-dw1000/Makefile b/pkg/uwb-dw1000/Makefile
@@ -24,5 +24,9 @@ ifneq (,$(filter llvm,$(TOOLCHAIN)))
   CFLAGS += -Wno-microsoft-anon-tag
 endif
 
+ifneq (,$(filter -DNDEBUG,$(CFLAGS)))
+  CFLAGS += -Wno-sometimes-uninitialized
+endif
+
 all:
 	$(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/hw/drivers/uwb/uwb_dw1000/src -f $(RIOTPKG)/uwb-dw1000/uwb-dw1000.mk MODULE=uwb-dw1000
diff --git a/sys/test_utils/netdev_eth_minimal/shell_commands.c b/sys/test_utils/netdev_eth_minimal/shell_commands.c
@@ -43,6 +43,7 @@ int ifconfig_list(int idx)
     printf("Iface %3d  HWaddr: ", idx);
     res = dev->driver->get(dev, NETOPT_ADDRESS, addr, sizeof(addr));
     assert(res > 0);
+    (void)res;  /* fix compilation problems with NDEBUG */
     l2util_addr_to_str(addr, ETHERNET_ADDR_LEN, addr_str);
     printf("%s\n", addr_str);
 
diff --git a/tests/drivers/dose/main.c b/tests/drivers/dose/main.c
@@ -21,9 +21,9 @@
 #include <stdio.h>
 
 #include "shell.h"
+#include "test_utils/expect.h"
 #include "test_utils/netdev_eth_minimal.h"
 #include "init_dev.h"
-#include "assert.h"
 #include "dose.h"
 #include "dose_params.h"
 
@@ -41,7 +41,7 @@ int netdev_eth_minimal_init_devs(netdev_event_cb_t cb) {
 
         /* initialize the device driver */
         int res = device->driver->init(device);
-        assert(!res);
+        expect(!res);
     }
 
     return 0;
diff --git a/tests/drivers/enc28j60/main.c b/tests/drivers/enc28j60/main.c
@@ -21,9 +21,9 @@
 #include <stdio.h>
 
 #include "shell.h"
-#include "assert.h"
 #include "enc28j60.h"
 #include "enc28j60_params.h"
+#include "test_utils/expect.h"
 #include "test_utils/netdev_eth_minimal.h"
 #include "init_dev.h"
 
@@ -41,7 +41,7 @@ int netdev_eth_minimal_init_devs(netdev_event_cb_t cb) {
 
         /* initialize the device driver */
         int res = device->driver->init(device);
-        assert(!res);
+        expect(!res);
     }
 
     return 0;
diff --git a/tests/drivers/encx24j600/main.c b/tests/drivers/encx24j600/main.c
@@ -21,9 +21,9 @@
 #include <stdio.h>
 
 #include "shell.h"
+#include "test_utils/expect.h"
 #include "test_utils/netdev_eth_minimal.h"
 #include "init_dev.h"
-#include "assert.h"
 #include "encx24j600.h"
 #include "encx24j600_params.h"
 
@@ -41,7 +41,7 @@ int netdev_eth_minimal_init_devs(netdev_event_cb_t cb) {
 
         /* initialize the device driver */
         int res = device->driver->init(device);
-        assert(!res);
+        expect(!res);
     }
 
     return 0;
diff --git a/tests/drivers/esp_eth/main.c b/tests/drivers/esp_eth/main.c
@@ -21,9 +21,9 @@
 #include <stdio.h>
 
 #include "shell.h"
+#include "test_utils/expect.h"
 #include "test_utils/netdev_eth_minimal.h"
 #include "init_dev.h"
-#include "assert.h"
 #include "net/netdev.h"
 #include "esp_eth_netdev.h"
 #include "esp_eth_params.h"
@@ -42,7 +42,7 @@ int netdev_eth_minimal_init_devs(netdev_event_cb_t cb) {
 
     /* initialize the device driver */
     int res = device->driver->init(device);
-    assert(!res);
+    expect(!res);
 
     return 0;
 }
diff --git a/tests/drivers/ethos/main.c b/tests/drivers/ethos/main.c
@@ -21,9 +21,9 @@
 #include <stdio.h>
 
 #include "shell.h"
+#include "test_utils/expect.h"
 #include "test_utils/netdev_eth_minimal.h"
 #include "init_dev.h"
-#include "assert.h"
 #include "ethos.h"
 #include "ethos_params.h"
 
@@ -42,7 +42,7 @@ int netdev_eth_minimal_init_devs(netdev_event_cb_t cb) {
 
         /* initialize the device driver */
         int res = device->driver->init(device);
-        assert(!res);
+        expect(!res);
     }
 
     return 0;
diff --git a/tests/drivers/sam0_eth/main.c b/tests/drivers/sam0_eth/main.c
@@ -21,9 +21,9 @@
 #include <stdio.h>
 
 #include "shell.h"
+#include "test_utils/expect.h"
 #include "test_utils/netdev_eth_minimal.h"
 #include "init_dev.h"
-#include "assert.h"
 #include "net/netdev.h"
 #include "sam0_eth_netdev.h"
 
@@ -39,7 +39,7 @@ int netdev_eth_minimal_init_devs(netdev_event_cb_t cb) {
 
     /* initialize the device driver */
     int res = sam0_eth.driver->init(&sam0_eth);
-    assert(!res);
+    expect(!res);
 
     return 0;
 }
diff --git a/tests/drivers/stm32_eth/main.c b/tests/drivers/stm32_eth/main.c
@@ -21,8 +21,8 @@
 #include <stdio.h>
 
 #include "shell.h"
-#include "assert.h"
 #include "stm32_eth.h"
+#include "test_utils/expect.h"
 #include "test_utils/netdev_eth_minimal.h"
 
 static netdev_t stm32_eth;
@@ -37,7 +37,7 @@ int netdev_eth_minimal_init_devs(netdev_event_cb_t cb) {
 
     /* initialize the device driver */
     int res = stm32_eth.driver->init(&stm32_eth);
-    assert(!res);
+    expect(!res);
 
     return 0;
 }
diff --git a/tests/drivers/w5100/main.c b/tests/drivers/w5100/main.c
@@ -21,9 +21,9 @@
 #include <stdio.h>
 
 #include "shell.h"
+#include "test_utils/expect.h"
 #include "test_utils/netdev_eth_minimal.h"
 #include "init_dev.h"
-#include "assert.h"
 #include "w5100.h"
 #include "w5100_params.h"
 
@@ -41,7 +41,7 @@ int netdev_eth_minimal_init_devs(netdev_event_cb_t cb) {
 
         /* initialize the device driver */
         int res = device->driver->init(device);
-        assert(!res);
+        expect(!res);
     }
 
     return 0;
diff --git a/tests/drivers/w5500/main.c b/tests/drivers/w5500/main.c
@@ -21,9 +21,9 @@
 #include <stdio.h>
 
 #include "shell.h"
+#include "test_utils/expect.h"
 #include "test_utils/netdev_eth_minimal.h"
 #include "init_dev.h"
-#include "assert.h"
 #include "w5500.h"
 #include "w5500_params.h"
 
@@ -41,7 +41,7 @@ int netdev_eth_minimal_init_devs(netdev_event_cb_t cb) {
 
         /* initialize the device driver */
         int res = device->driver->init(device);
-        assert(!res);
+        expect(!res);
     }
 
     return 0;
diff --git a/tests/net/gnrc_sixlowpan_frag_sfr_congure/mockup_netif.c b/tests/net/gnrc_sixlowpan_frag_sfr_congure/mockup_netif.c
@@ -22,6 +22,7 @@
 #include "net/gnrc/netif/internal.h"
 #include "net/netdev_test.h"
 #include "sched.h"
+#include "test_utils/expect.h"
 #include "thread.h"
 
 #define _MSG_QUEUE_SIZE  (2)
@@ -35,7 +36,7 @@ static gnrc_netif_t _netif;
 
 void _common_set_up(void)
 {
-    assert(_mock_netif != NULL);
+    expect(_mock_netif != NULL);
     gnrc_ipv6_nib_init();
     gnrc_netif_acquire(_mock_netif);
     gnrc_ipv6_nib_init_iface(_mock_netif);
@@ -45,14 +46,14 @@ void _common_set_up(void)
 int _get_device_type(netdev_t *dev, void *value, size_t max_len)
 {
     (void)dev;
-    assert(max_len == sizeof(uint16_t));
+    expect(max_len == sizeof(uint16_t));
     *((uint16_t *)value) = NETDEV_TYPE_IEEE802154;
     return sizeof(uint16_t);
 }
 
 static int _get_netdev_proto(netdev_t *netdev, void *value, size_t max_len)
 {
-    assert(max_len == sizeof(gnrc_nettype_t));
+    expect(max_len == sizeof(gnrc_nettype_t));
     (void)netdev;
 
     *((gnrc_nettype_t *)value) = GNRC_NETTYPE_SIXLOWPAN;
@@ -62,15 +63,15 @@ static int _get_netdev_proto(netdev_t *netdev, void *value, size_t max_len)
 int _get_max_packet_size(netdev_t *dev, void *value, size_t max_len)
 {
     (void)dev;
-    assert(max_len == sizeof(uint16_t));
+    expect(max_len == sizeof(uint16_t));
     *((uint16_t *)value) = 102U;
     return sizeof(uint16_t);
 }
 
 int _get_src_len(netdev_t *dev, void *value, size_t max_len)
 {
     (void)dev;
-    assert(max_len == sizeof(uint16_t));
+    expect(max_len == sizeof(uint16_t));
     *((uint16_t *)value) = IEEE802154_LONG_ADDRESS_LEN;
     return sizeof(uint16_t);
 }
@@ -81,15 +82,15 @@ int _get_address_long(netdev_t *dev, void *value, size_t max_len)
                                     _LL4, _LL5, _LL6, _LL7 };
 
     (void)dev;
-    assert(max_len >= sizeof(addr));
+    expect(max_len >= sizeof(addr));
     memcpy(value, addr, sizeof(addr));
     return sizeof(addr);
 }
 
 int _get_proto(netdev_t *dev, void *value, size_t max_len)
 {
     (void)dev;
-    assert(max_len == sizeof(gnrc_nettype_t));
+    expect(max_len == sizeof(gnrc_nettype_t));
     *((gnrc_nettype_t *)value) = GNRC_NETTYPE_SIXLOWPAN;
     return sizeof(gnrc_nettype_t);
 }
@@ -116,7 +117,7 @@ void _tests_init(void)
             &_netif, _mock_netif_stack, THREAD_STACKSIZE_DEFAULT,
             GNRC_NETIF_PRIO, "mockup_wpan", &_mock_netdev.netdev.netdev
         );
-    assert(res == 0);
+    expect(res == 0);
     _mock_netif = &_netif;
 }
 
diff --git a/tests/net/gnrc_tx_sync/main.c b/tests/net/gnrc_tx_sync/main.c
@@ -116,7 +116,7 @@ static int netdev_get_max_pdu_size(netdev_t *dev, void *value, size_t max_len)
     (void)dev;
     const uint16_t pdu_size_ethernet = 1500;
     const uint16_t pdu_size_6lo = 96;
-    assert(max_len == sizeof(uint16_t));
+    expect(max_len == sizeof(uint16_t));
     if (IS_USED(MODULE_NETDEV_IEEE802154)) {
         memcpy(value, &pdu_size_6lo, sizeof(pdu_size_6lo));
     }
diff --git a/tests/net/ieee802154_hal/main.c b/tests/net/ieee802154_hal/main.c
@@ -422,12 +422,12 @@ int _test_states(int argc, char **argv)
 
     /* Force transition to IDLE */
     res = ieee802154_radio_set_idle(&_radio, true);
-    assert(res == 0);
+    expect(res == 0);
 
     printf("Testing TX<->RX transition time: ");
     a = xtimer_now();
     res = ieee802154_radio_set_rx(&_radio);
-    assert(res == 0);
+    expect(res == 0);
     usecs = xtimer_usec_from_ticks(xtimer_diff(xtimer_now(), a));
     printf("%" PRIu32 " us (%s)\n", usecs, usecs > MAX_TX_RX_TURNAROUND
                                            ? "FAIL"
@@ -436,7 +436,7 @@ int _test_states(int argc, char **argv)
     printf("Testing RX<->TX transition time: ");
     a = xtimer_now();
     res = ieee802154_radio_set_idle(&_radio, true);
-    assert(res == 0);
+    expect(res == 0);
     usecs = xtimer_usec_from_ticks(xtimer_diff(xtimer_now(), a));
     printf("%" PRIu32 " us (%s)\n", usecs, usecs > MAX_TX_RX_TURNAROUND
                                            ? "FAIL"
diff --git a/tests/periph/flashpage/main.c b/tests/periph/flashpage/main.c
diff --git a/tests/sys/usbus_msc/main.c b/tests/sys/usbus_msc/main.c
diff --git a/tests/sys/vfs_iterate_mount/main.c b/tests/sys/vfs_iterate_mount/main.c

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,7 @@ void i2c_init(i2c_t dev)`
`171`	`171`	`default:`
`172`	`172`	`LOG_TAG_ERROR("i2c", "Invalid speed value in %s\n", __func__);`
`173`	`173`	`assert(0);`
	`174`	`+ return;`
`174`	`175`	`}`
`175`	`176`
`176`	`177`	`_i2c_bus[dev].clk_freq = clk_speed;`
Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,7 @@ uint32_t pwm_init(pwm_t pwm, pwm_mode_t mode, uint32_t freq, uint16_t res)`
`112`	`112`
`113`	`113`	`uint8_t pwm_channels(pwm_t pwm)`
`114`	`114`	`{`
	`115`	`+ (void)pwm; /* avoid compilation problems with NDEBUG */`
`115`	`116`	`assert(pwm < PWM_NUMOF);`
`116`	`117`	`return PWM_CHANNEL_NUMOF;`
`117`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ uint16_t _cst816s_height(const touch_dev_t *touch_dev)`
`43`	`43`	`{`
`44`	`44`	`const cst816s_t dev = (const cst816s_t )touch_dev;`
`45`	`45`	`assert(dev);`
	`46`	`+ (void)dev; /* avoid compilation problems with NDEBUG */`
`46`	`47`
`47`	`48`	`return CST816S_YMAX;`
`48`	`49`	`}`
`@@ -51,6 +52,7 @@ uint16_t _cst816s_width(const touch_dev_t *touch_dev)`
`51`	`52`	`{`
`52`	`53`	`const cst816s_t dev = (const cst816s_t )touch_dev;`
`53`	`54`	`assert(dev);`
	`55`	`+ (void)dev; /* avoid compilation problems with NDEBUG */`
`54`	`56`
`55`	`57`	`return CST816S_XMAX;`
`56`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,7 @@ int soft_spi_init_cs(soft_spi_t bus, soft_spi_cs_t cs)`
`101`	`101`	`return SOFT_SPI_OK;`
`102`	`102`	`}`
`103`	`103`
	`104`	`+MAYBE_UNUSED`
`104`	`105`	`static inline int soft_spi_mode_is_valid(soft_spi_mode_t mode)`
`105`	`106`	`{`
`106`	`107`	`if ((mode != SOFT_SPI_MODE_0) && (mode != SOFT_SPI_MODE_1) &&`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ static uint8_t _rmt_channel(ws281x_t *dev)`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`	`assert(0);`
	`67`	`+ return 0; /* avoid compilation problems with NDEBUG */`
`67`	`68`	`}`
`68`	`69`	`#endif`
`69`	`70`