From: Evan Hunt <each@isc.org>
Date: Sat, 20 Jun 2020 22:39:43 +0000 (-0700)
Subject: reorder system tests to shorten runtime
X-Git-Tag: v9.17.3~45^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9154f2aab01d4af22f7c581578ab0eef03b787c;p=thirdparty%2Fbind9.git

reorder system tests to shorten runtime

if tests that take a particularly long time to complete
(serve-stale, dnssec, rpzrecurse) are run first, a parallel
run of the system tests can finish 1-2 minutes faster.
---

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index 9c812ad8cfb..3abe7a4738f 100644
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -64,7 +64,19 @@ tkey_keydelete_LDADD =		\
 	$(LDADD)		\
 	$(LIBDNS_LIBS)
 
-TESTS = 			\
+TESTS =
+
+if HAVE_PERLMOD_TIME_HIRES
+TESTS += serve-stale
+endif HAVE_PERLMOD_TIME_HIRES
+
+if HAVE_PERLMOD_NET_DNS
+TESTS +=		\
+	dnssec		\
+	rpzrecurse
+endif HAVE_PERLMOD_NET_DNS
+
+TESTS += 			\
 	acl			\
 	additional		\
 	addzone			\
@@ -158,13 +170,11 @@ if HAVE_PERLMOD_NET_DNS
 
 TESTS +=		\
 	digdelv		\
-	dnssec		\
 	fetchlimit	\
 	forward		\
 	ixfr		\
 	nsupdate	\
 	resolver	\
-	rpzrecurse	\
 	statistics	\
 	upforwd		\
 	zero
@@ -181,10 +191,6 @@ if HAVE_PERLMOD_DIGEST_HMAC
 TESTS += xfer
 endif HAVE_PERLMOD_DIGEST_HMAC
 
-if HAVE_PERLMOD_TIME_HIRES
-TESTS += serve-stale
-endif HAVE_PERLMOD_TIME_HIRES
-
 if HAVE_PERLMOD_NET_DNS_NAMESERVER
 TESTS += reclimit
 endif HAVE_PERLMOD_NET_DNS_NAMESERVER