shared/n-acd: reimportth/shared-tools-reimport

  git subtree pull --prefix shared/n-acd git@github.com:nettools/n-acd.git master --squash

1 files changed, 12 insertions, 12 deletions

diff --git a/shared/n-acd/src/test-loopback.c b/shared/n-acd/src/test-loopback.c
index 5c01d65b68..0671cf6691 100644
--- a/shared/n-acd/src/test-loopback.c
+++ b/shared/n-acd/src/test-loopback.c
@@ -5,6 +5,8 @@
  * non-spanning-tree networks, or on networks that echo packets.
  */
 
+#undef NDEBUG
+#include <c-stdaux.h>
 #include <stdlib.h>
 #include "test.h"
 
@@ -15,14 +17,14 @@ static void test_loopback(int ifindex, uint8_t *mac, size_t n_mac) {
         int r, fd;
 
         r = n_acd_config_new(&config);
-        assert(!r);
+        c_assert(!r);
 
         n_acd_config_set_ifindex(config, ifindex);
         n_acd_config_set_transport(config, N_ACD_TRANSPORT_ETHERNET);
         n_acd_config_set_mac(config, mac, n_mac);
 
         r = n_acd_new(&acd, config);
-        assert(!r);
+        c_assert(!r);
 
         n_acd_config_free(config);
 
@@ -32,13 +34,13 @@ static void test_loopback(int ifindex, uint8_t *mac, size_t n_mac) {
                 struct in_addr ip = { htobe32((192 << 24) | (168 << 16) | (1 << 0)) };
 
                 r = n_acd_probe_config_new(&probe_config);
-                assert(!r);
+                c_assert(!r);
 
                 n_acd_probe_config_set_ip(probe_config, ip);
                 n_acd_probe_config_set_timeout(probe_config, 100);
 
                 r = n_acd_probe(acd, &probe, probe_config);
-                assert(!r);
+                c_assert(!r);
 
                 n_acd_probe_config_free(probe_config);
 
@@ -48,15 +50,15 @@ static void test_loopback(int ifindex, uint8_t *mac, size_t n_mac) {
                         NAcdEvent *event;
                         pfds = (struct pollfd){ .fd = fd, .events = POLLIN };
                         r = poll(&pfds, 1, -1);
-                        assert(r >= 0);
+                        c_assert(r >= 0);
 
                         r = n_acd_dispatch(acd);
-                        assert(!r);
+                        c_assert(!r);
 
                         r = n_acd_pop_event(acd, &event);
-                        assert(!r);
+                        c_assert(!r);
                         if (event) {
-                                assert(event->event == N_ACD_EVENT_READY);
+                                c_assert(event->event == N_ACD_EVENT_READY);
                                 break;
                         }
                 }
@@ -69,11 +71,9 @@ static void test_loopback(int ifindex, uint8_t *mac, size_t n_mac) {
 
 int main(int argc, char **argv) {
         struct ether_addr mac;
-        int r, ifindex;
+        int ifindex;
 
-        r = test_setup();
-        if (r)
-                return r;
+        test_setup();
 
         test_loopback_up(&ifindex, &mac);
         test_loopback(ifindex, mac.ether_addr_octet, sizeof(mac.ether_addr_octet));