reorder tests to get better use of parallelism

(cherry picked from commit 56e440f65f72939a79df92aeed21213155923602)
(cherry picked from commit 4429f8b2915515ed91d38f7b92b6e73ce61fd635)
(cherry picked from commit fa8740fedab92a8b2706454cbf95b88fb7685762)

diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index cd8895e4bab9802160daeb2d238fbad017fa7eba..a033adfedc6a0be87c6ec882cd56487b7e75b6f7 100644 (file)
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -85,27 +85,22 @@ test: parallel.mk subdirs
        @$(SHELL) ./testsummary.sh
 
 # Define the tests that can be run in parallel.  This should be identical to
-# the definition of PARALLELDIRS in conf.sh.
+# the definition of PARALLELDIRS in conf.sh. Note: long-running tests
+# such as allow_query and serve-stale are scheduled first to get more
+# benefit from parallelism.
 
 PARALLEL = acl additional addzone allow_query autosign \
-          builtin cacheclean chain \
-          checkconf checknames checkzone \
-          @CHECKDS@ @COVERAGE@ \
-          cookie database digdelv dlv dlz dlzexternal \
-          dns64 dnssec dscp dsdigest \
-          ednscompliance emptyzones \
-          fetchlimit filter-aaaa formerr forward \
-          geoip glue inline integrity ixfr \
-          legacy limits logfileconfig \
-          masterfile masterformat metadata \
-          notify nslookup nsupdate \
-          pending \
-          reclimit redirect resolver rndc rpz rpzrecurse \
-          rrchecker rrl rrsetorder rsabigexponent runtime \
-          smartsign sortlist \
+          builtin cacheclean chain checkconf checknames \
+          checkzone @CHECKDS@ @COVERAGE@ cookie database \
+          digdelv dlv dlz dlzexternal dns64 dnssec dscp dsdigest \
+          ednscompliance emptyzones fetchlimit filter-aaaa \
+          formerr forward geoip glue inline integrity ixfr \
+          legacy limits logfileconfig masterfile masterformat \
+          metadata notify nslookup nsupdate pending reclimit \
+          redirect resolver rndc rpz rpzrecurse rrchecker rrl \
+          rrsetorder rsabigexponent runtime smartsign sortlist \
           spf staticstub statistics statschannel stub \
-          tcp tsig tsiggss \
-          unknown upforwd verify views wildcard \
+          tcp tsig tsiggss unknown upforwd verify views wildcard \
           xfer xferquota zero zonechecks
 
 # Produce intermediate makefile that assigns unique port numbers to each

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index a9132c6d0e509167d2beeac72740a9cd9737fafe..f981ec80016eae7d24ab941a436eca9e6512c846 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -87,7 +87,8 @@ SEQUENTIALDIRS="dlzredir ecdsa eddsa gost lwresd @PKCS11_TEST@ tkey"
 # test, these tests can be run in parallel.
 #
 # This symbol must be kept in step with the PARALLEL macro in Makefile.in
-PARALLELDIRS="acl additional addzone allow_query autosign
+PARALLELDIRS="allow_query rpzrecurse \
+        acl additional addzone autosign
         builtin cacheclean chain
         checkconf checknames checkzone
         @CHECKDS@ @COVERAGE@
@@ -99,7 +100,7 @@ PARALLELDIRS="acl additional addzone allow_query autosign
         legacy limits logfileconfig
         masterfile masterformat metadata
         notify nslookup nsupdate pending
-        reclimit redirect resolver rndc rpz rpzrecurse
+        reclimit redirect resolver rndc rpz
         rrchecker rrl rrsetorder rsabigexponent runtime
         smartsign sortlist
         spf staticstub statistics statschannel stub