From 623f2fdb18d4aa1ebcb087cf78ef9956ac584ed6 Mon Sep 17 00:00:00 2001
From: Tony Finch <fanf@isc.org>
Date: Wed, 10 May 2023 17:15:21 +0100
Subject: [PATCH] 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.
---
 tests/ns/listenlist_test.c | 3 +--
 tests/ns/notify_test.c     | 3 +--
 tests/ns/query_test.c      | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/tests/ns/listenlist_test.c b/tests/ns/listenlist_test.c
index a7ddcf828a..35ac84f15c 100644
--- 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 615cb57a25..1410f6d148 100644
--- 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 6dcf5f102f..adfcc03100 100644
--- 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>