Unify header ordering in unit tests

Make sure all unit tests include headers in a similar order:

 1. Three headers which must be included before <cmocka.h>.
 2. System headers.
 3. UNIT_TESTING definition, followed by the <cmocka.h> header.
 4. libisc headers.
 5. Headers from other BIND libraries.
 6. Local headers.

Also make sure header file names are sorted alphabetically within each
block of #include directives.

(cherry picked from commit 5381ac0fcc4db3c574d28ee0b0886ce430548161)

diff --git a/lib/dns/tests/dh_test.c b/lib/dns/tests/dh_test.c
index da1f5e9a80af0a8dbdc41710fcd3fcfd74ce406f..a5bf46c9eeaebb936ab36270c03a3c7503215615 100644 (file)
--- a/lib/dns/tests/dh_test.c
+++ b/lib/dns/tests/dh_test.c
@@ -29,11 +29,12 @@
 #include <isc/string.h>
 #include <isc/util.h>
 
-#include <pk11/site.h>
-
 #include <dns/name.h>
+
 #include <dst/result.h>
 
+#include <pk11/site.h>
+
 #include "../dst_internal.h"
 
 #include "dnstest.h"

diff --git a/lib/dns/tests/master_test.c b/lib/dns/tests/master_test.c
index 639a8e66ae3112d493d3ee40b27faed0b1b49967..525301fff8b2087db3f7a8b26dae581991a81fe3 100644 (file)
--- a/lib/dns/tests/master_test.c
+++ b/lib/dns/tests/master_test.c
@@ -27,10 +27,9 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
-#include <isc/util.h>
-
 #include <isc/print.h>
 #include <isc/string.h>
+#include <isc/util.h>
 #include <isc/xml.h>
 
 #include <dns/cache.h>

diff --git a/lib/dns/tests/rbt_serialize_test.c b/lib/dns/tests/rbt_serialize_test.c
index fc9f44860d341aa2f189fc9b1612b19d6ff50359..6e8bd36235cd7d18c6448dbc28ca812f9df13737 100644 (file)
--- a/lib/dns/tests/rbt_serialize_test.c
+++ b/lib/dns/tests/rbt_serialize_test.c
@@ -28,12 +28,6 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
-#include <dns/rbt.h>
-#include <dns/fixedname.h>
-#include <dns/result.h>
-#include <dns/compress.h>
-#include "dnstest.h"
-
 #include <isc/app.h>
 #include <isc/buffer.h>
 #include <isc/commandline.h>
@@ -44,19 +38,25 @@
 #include <isc/os.h>
 #include <isc/print.h>
 #include <isc/random.h>
-#include <isc/string.h>
 #include <isc/socket.h>
 #include <isc/stdio.h>
+#include <isc/string.h>
 #include <isc/task.h>
 #include <isc/timer.h>
 #include <isc/util.h>
 
+#include <dns/compress.h>
+#include <dns/fixedname.h>
 #include <dns/log.h>
 #include <dns/name.h>
+#include <dns/rbt.h>
+#include <dns/result.h>
 #include <dns/result.h>
 
 #include <dst/dst.h>
 
+#include "dnstest.h"
+
 #ifndef MAP_FILE
 #define MAP_FILE 0
 #endif

diff --git a/lib/dns/tests/resolver_test.c b/lib/dns/tests/resolver_test.c
index 051880913cba3b86029d5c841372cabb743175ad..a3cefa4fb4bb181f9eaab6b91d1134a73cbf1eda 100644 (file)
--- a/lib/dns/tests/resolver_test.c
+++ b/lib/dns/tests/resolver_test.c
@@ -24,14 +24,13 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
-#include <isc/util.h>
-
 #include <isc/app.h>
 #include <isc/buffer.h>
 #include <isc/print.h>
 #include <isc/socket.h>
 #include <isc/task.h>
 #include <isc/timer.h>
+#include <isc/util.h>
 
 #include <dns/dispatch.h>
 #include <dns/name.h>

diff --git a/lib/dns/tests/result_test.c b/lib/dns/tests/result_test.c
index 3137fbfc4bb9700523d2455ed47b2a6eddf8bc11..1df2e63241887283acebb721d6a8a27cf62171aa 100644 (file)
--- a/lib/dns/tests/result_test.c
+++ b/lib/dns/tests/result_test.c
@@ -15,8 +15,9 @@
 
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdlib.h>
 #include <setjmp.h>
+
+#include <stdlib.h>
 #include <string.h>
 
 #define UNIT_TESTING

diff --git a/lib/dns/tests/sigs_test.c b/lib/dns/tests/sigs_test.c
index 62864fc8fddd5a0941ac212be5c4892409542b30..7b92b1a0bc999f151ce0ecbb2ae8c6489b595d81 100644 (file)
--- a/lib/dns/tests/sigs_test.c
+++ b/lib/dns/tests/sigs_test.c
@@ -27,7 +27,13 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
+#include <isc/buffer.h>
+#include <isc/list.h>
 #include <isc/print.h>
+#include <isc/region.h>
+#include <isc/result.h>
+#include <isc/stdtime.h>
+#include <isc/types.h>
 #include <isc/util.h>
 
 #include <dns/db.h>
@@ -44,13 +50,6 @@
 
 #include <dst/dst.h>
 
-#include <isc/buffer.h>
-#include <isc/list.h>
-#include <isc/region.h>
-#include <isc/stdtime.h>
-#include <isc/result.h>
-#include <isc/types.h>
-
 #include "../zone_p.h"
 
 #include "dnstest.h"

diff --git a/lib/isc/tests/aes_test.c b/lib/isc/tests/aes_test.c
index 5d950944cd2714f665c6fbe146ceaa61763802ba..0d946e0bb92ccf55291ead7272369435c021b748 100644 (file)
--- a/lib/isc/tests/aes_test.c
+++ b/lib/isc/tests/aes_test.c
@@ -13,12 +13,12 @@
 
 #if HAVE_CMOCKA
 
-#include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdlib.h>
+#include <setjmp.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #define UNIT_TESTING

diff --git a/lib/isc/tests/atomic_test.c b/lib/isc/tests/atomic_test.c
index 1244512e176b00e8215f983ba4c8093b0e246410..fb0be95d3d724bcbd6d9f7a179d9cdd7920feda9 100644 (file)
--- a/lib/isc/tests/atomic_test.c
+++ b/lib/isc/tests/atomic_test.c
@@ -18,13 +18,13 @@
 #include <stddef.h>
 #include <setjmp.h>
 
-#define UNIT_TESTING
-#include <cmocka.h>
-
 #include <sched.h>
 #include <inttypes.h>
 #include <string.h>
 
+#define UNIT_TESTING
+#include <cmocka.h>
+
 #include <isc/atomic.h>
 #include <isc/print.h>
 #include <isc/result.h>

diff --git a/lib/isc/tests/errno_test.c b/lib/isc/tests/errno_test.c
index 761d243784ff6a92f6ec27bc199646bcb88ac60f..839a069a7f305d47099c48d0f9f439f442e4b776 100644 (file)
--- a/lib/isc/tests/errno_test.c
+++ b/lib/isc/tests/errno_test.c
@@ -13,13 +13,14 @@
 
 #if HAVE_CMOCKA
 
-#include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdlib.h>
+#include <setjmp.h>
 
 #include <sched.h>
+#include <stdlib.h>
 #include <string.h>
+
 #include <sys/errno.h>
 
 #define UNIT_TESTING

diff --git a/lib/isc/tests/hash_test.c b/lib/isc/tests/hash_test.c
index 8ddfe70529fb5f1abc294e57e37f5185c98a7b7d..31ced94f5cb29ad78803951d14c72308ec30e60b 100644 (file)
--- a/lib/isc/tests/hash_test.c
+++ b/lib/isc/tests/hash_test.c
@@ -26,16 +26,15 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
-#include <isc/hash.h>
-
 #include <isc/crc64.h>
+#include <isc/hash.h>
 #include <isc/hmacmd5.h>
 #include <isc/hmacsha.h>
 #include <isc/md5.h>
-#include <isc/sha1.h>
-#include <isc/util.h>
 #include <isc/print.h>
+#include <isc/sha1.h>
 #include <isc/string.h>
+#include <isc/util.h>
 
 #include <pk11/site.h>
 

diff --git a/lib/isc/tests/netaddr_test.c b/lib/isc/tests/netaddr_test.c
index b8e9d13e729f56a7c6fb669986963129b2131242..a3e7e9e80da83a33b8487fcc5dfaa232a890547c 100644 (file)
--- a/lib/isc/tests/netaddr_test.c
+++ b/lib/isc/tests/netaddr_test.c
@@ -15,11 +15,11 @@
 
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdlib.h>
 #include <setjmp.h>
 
 #include <stdbool.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #define UNIT_TESTING

diff --git a/lib/isc/tests/regex_test.c b/lib/isc/tests/regex_test.c
index 86e9439caf0a101e2f7801e688cc83790869d8b9..66b6acfd6da2e530f96f879ab87c1443f748ee3f 100644 (file)
--- a/lib/isc/tests/regex_test.c
+++ b/lib/isc/tests/regex_test.c
@@ -22,13 +22,13 @@
 #include <string.h>
 #include <unistd.h>
 
-#define UNIT_TESTING
-#include <cmocka.h>
-
 #ifdef HAVE_REGEX_H
 #include <regex.h>
 #endif
 
+#define UNIT_TESTING
+#include <cmocka.h>
+
 #include <isc/commandline.h>
 #include <isc/regex.h>
 #include <isc/print.h>

diff --git a/lib/isc/tests/result_test.c b/lib/isc/tests/result_test.c
index ff2a7b264cc558582c7fde82480bc07fdb821750..6cb3d3bb12599bbf30dc808680177701f41db8e7 100644 (file)
--- a/lib/isc/tests/result_test.c
+++ b/lib/isc/tests/result_test.c
@@ -15,8 +15,9 @@
 
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdlib.h>
 #include <setjmp.h>
+
+#include <stdlib.h>
 #include <string.h>
 
 #define UNIT_TESTING

diff --git a/lib/isccc/tests/result_test.c b/lib/isccc/tests/result_test.c
index c0e70f740345f047f584fa4ee1fd0b40eee4016c..6a86ccc9099d1822a20796590fe837c5444d1877 100644 (file)
--- a/lib/isccc/tests/result_test.c
+++ b/lib/isccc/tests/result_test.c
@@ -15,8 +15,9 @@
 
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdlib.h>
 #include <setjmp.h>
+
+#include <stdlib.h>
 #include <string.h>
 
 #define UNIT_TESTING