reorder tests to get better use of parallelism

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

diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index 10aebf9859e19bb20590356d0a8f79243600bd03..b866ca7ef9d87ad90a3eb2071694929eb28e31b4 100644 (file)
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -44,9 +44,12 @@ feature-test@EXEEXT@: feature-test.@O@
 # used.
 
 # 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 \
+PARALLEL = allow_query rpzrecurse \
+          acl additional addzone autosign \
           builtin cacheclean case catz chain \
           checkconf checknames checkzone \
           @CHECKDS@ @COVERAGE@ @KEYMGR@ \
@@ -59,7 +62,7 @@ PARALLEL = acl additional addzone allow_query autosign \
           masterfile masterformat metadata mkeys \
           names notify nslookup nsupdate nzd2nzf \
           pending pipelined \
-          reclimit redirect resolver rndc rpz rpzrecurse \
+          reclimit redirect resolver rndc rpz \
           rrchecker rrl rrsetorder rsabigexponent runtime \
           sfcache smartsign sortlist \
           spf staticstub statistics statschannel stub \