Prioritize long-running system tests for legacy runner

Synchronize the test priority with the pytest runner (which handles the
prioritization in conftest.py).

(cherry picked from commit 15fa8f1506f28fdc304f863155cf71f50ed917c1)

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index 3abfad1dc25167a3dcdda19e8b9b6e32ef7b1e77..befd51270fd6b93ffe0b45446dd7fe3b263e7204 100644 (file)
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -83,7 +83,14 @@ tkey_keydelete_LDADD =               \
        $(LDADD)                \
        $(LIBDNS_LIBS)
 
+# Longer running tests are listed (and executed) first to take the most
+# advantage of parallel execution.
 TESTS =                                \
+       rpz                     \
+       rpzrecurse              \
+       serve-stale             \
+       timeouts                \
+       upforwd                 \
        acl                     \
        additional              \
        addzone                 \
@@ -159,15 +166,12 @@ TESTS =                           \
        resolver                \
        rndc                    \
        rootkeysentinel         \
-       rpz                     \
        rpzextra                \
-       rpzrecurse              \
        rrchecker               \
        rrl                     \
        rrsetorder              \
        rsabigexponent          \
        runtime                 \
-       serve-stale             \
        sfcache                 \
        shutdown                \
        smartsign               \
@@ -180,7 +184,6 @@ TESTS =                             \
        stub                    \
        synthfromdnssec         \
        tcp                     \
-       timeouts                \
        tkey                    \
        tools                   \
        transport-acl           \
@@ -188,7 +191,6 @@ TESTS =                             \
        tsiggss                 \
        ttl                     \
        unknown                 \
-       upforwd                 \
        verify                  \
        views                   \
        wildcard                \