Avoid lossage from <stdnoreturn.h>

A few of the source files in `tests/ns` included `<isc/util.h>`
before `<cmocka.h>`. This could cause compile failures because the
`CMOCKA_NORETURN` macro is defined as `__attribute__((noreturn))`
and `<stdnoreturn.h>` defines `noreturn` as `_Noreturn` which does
not work as a gcc-style attribute.

diff --git a/tests/ns/listenlist_test.c b/tests/ns/listenlist_test.c
index a7ddcf828a36523cd0b276e349385f05b5e932ab..35ac84f15cf35ec6d6cf1e8ef97dc1a37bcb5f67 100644 (file)
--- a/tests/ns/listenlist_test.c
+++ b/tests/ns/listenlist_test.c
@@ -20,13 +20,12 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <isc/util.h>
-
 #define UNIT_TESTING
 #include <cmocka.h>
 
 #include <isc/list.h>
 #include <isc/random.h>
+#include <isc/util.h>
 
 #include <dns/acl.h>
 

diff --git a/tests/ns/notify_test.c b/tests/ns/notify_test.c
index 615cb57a25ebaa6abd244727211b79d3189e6e78..1410f6d14845c2197009998e4769bb36a402b9d7 100644 (file)
--- a/tests/ns/notify_test.c
+++ b/tests/ns/notify_test.c
@@ -20,12 +20,11 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <isc/util.h>
-
 #define UNIT_TESTING
 #include <cmocka.h>
 
 #include <isc/thread.h>
+#include <isc/util.h>
 
 #include <dns/acl.h>
 #include <dns/rcode.h>

diff --git a/tests/ns/query_test.c b/tests/ns/query_test.c
index 6dcf5f102fbcb60d4c2704b17e6318eb37cb3a3c..adfcc031007bc5468f7cdb453993dcbe99ade4e3 100644 (file)
--- a/tests/ns/query_test.c
+++ b/tests/ns/query_test.c
@@ -20,12 +20,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <isc/util.h>
-
 #define UNIT_TESTING
 #include <cmocka.h>
 
 #include <isc/quota.h>
+#include <isc/util.h>
 
 #include <dns/badcache.h>
 #include <dns/view.h>