reorder tests to get better use of parallelism

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

diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index 7a9a8cd04495e14efe853901264eca65b5b00615..f5db075f9568a2b264efbeb5020b2afe7352b45d 100644 (file)
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -51,27 +51,22 @@ feature-test@EXEEXT@: feature-test.@O@
 # build directory is used.
 
 # Define the tests that can be run in parallel.  This should be identical to
-# the definition of PARALLELDIRS in conf.sh.
-
-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 \
+# 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 = allow_query acl additional addzone 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 \
           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 0f3d9a9896e218e6872413ce74ef9b0d4f05f462..4b7cc1c33db90e0af50528bd0ab63b9ab6f48d71 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -78,7 +78,7 @@ SEQUENTIALDIRS="ecdsa eddsa gost lwresd pkcs11 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 allow_query addzone autosign builtin
+PARALLELDIRS="allow_query acl additional addzone autosign builtin
         cacheclean case chain checkconf @CHECKDS@ checknames
          checkzone @COVERAGE@ database digdelv dlv dlz dlzexternal
         dns64 dnssec ecdsa eddsa emptyzones fetchlimit filter-aaaa