From 68f186dd82f12e966e2dbb2f47dc1de2a1ac80b5 Mon Sep 17 00:00:00 2001
From: Tom Krizek <tkrizek@isc.org>
Date: Mon, 4 Sep 2023 16:08:06 +0200
Subject: [PATCH] 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)
---
 bin/tests/system/Makefile.am | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index 3abfad1dc2..befd51270f 100644
--- 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		\