From 188631fdd91b4252720e3ced7d15bfb3b8c44695 Mon Sep 17 00:00:00 2001
From: Matthijs Mekking <matthijs@isc.org>
Date: Thu, 30 Apr 2020 09:28:21 +0200
Subject: [PATCH 1/4] Add missing system test in Makefile

Add the missing tests in the Makefile (include-multiplecfg kasp
pkcs11 ttl).  Also put them in alphabetical order.
---
 bin/tests/system/Makefile.am | 101 +++++++++++++++++++++++++++--------
 1 file changed, 78 insertions(+), 23 deletions(-)

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index ea4d13a934..43d5ea0eaf 100644
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -67,27 +67,82 @@ wire_test_LDADD =		\
 	$(LIBDNS_LIBS)
 endif HAVE_DNSTAP
 
-TESTS = \
-	acl additional addzone allow-query auth autosign \
-	builtin cacheclean case catz cds \
-	checkconf checknames checkzone \
-	cookie database dlz dlzexternal \
-	dns64 dscp dsdigest dyndb \
-	ednscompliance emptyzones \
-	filter-aaaa formerr \
-	geoip2 glue idna inline integrity keepalive \
-	legacy limits logfileconfig \
-	masterfile masterformat metadata mirror mkeys \
-	names notify nslookup \
-	padding pending \
-	redirect rndc rootkeysentinel rpz \
-	rrchecker rrl rrsetorder rsabigexponent runtime \
-	sfcache smartsign sortlist \
-	spf staticstub stub synthfromdnssec \
-	tools tsig tsiggss \
-	unknown verify views wildcard \
-	xferquota zonechecks \
-	ecdsa tkey
+TESTS = 			\
+	acl			\
+	additional		\
+	addzone			\
+	allow-query		\
+	auth			\
+	autosign		\
+	builtin			\
+	cacheclean		\
+	case			\
+	catz			\
+	cds			\
+	checkconf		\
+	checknames		\
+	checkzone		\
+	cookie			\
+	database		\
+	dlz			\
+	dlzexternal		\
+	dns64			\
+	dscp			\
+	dsdigest		\
+	dyndb			\
+	ecdsa			\
+	ednscompliance		\
+	emptyzones		\
+	filter-aaaa		\
+	formerr			\
+	geoip2			\
+	glue			\
+	idna			\
+	include-multipecfg 	\
+	inline			\
+	integrity		\
+	kasp			\
+	keepalive		\
+	legacy			\
+	limits			\
+	logfileconfig		\
+	masterfile		\
+	masterformat		\
+	metadata		\
+	mirror			\
+	mkeys			\
+	names			\
+	notify			\
+	nslookup		\
+	padding			\
+	pending			\
+	redirect		\
+	rndc			\
+	rootkeysentinel		\
+	rpz			\
+	rrchecker		\
+	rrl			\
+	rrsetorder		\
+	rsabigexponent		\
+	runtime			\
+	sfcache			\
+	smartsign		\
+	sortlist		\
+	spf			\
+	staticstub		\
+	stub			\
+	synthfromdnssec		\
+	tkey			\
+	tools			\
+	tsig			\
+	tsiggss			\
+	ttl			\
+	unknown			\
+	verify			\
+	views			\
+	wildcard		\
+	xferquota		\
+	zonechecks
 
 # eddsa test is broken
 # TESTS += eddsa
@@ -105,7 +160,6 @@ endif # HAVE_LMDB
 if HAVE_PERLMOD_NET_DNS
 
 TESTS +=		\
-	zero		\
 	digdelv		\
 	dnssec		\
 	fetchlimit	\
@@ -115,7 +169,8 @@ TESTS +=		\
 	resolver	\
 	rpzrecurse	\
 	statistics	\
-	upforwd
+	upforwd		\
+	zero
 
 if HAVE_DNSTAP
 TESTS += dnstap

From ac7644f4124b8ffbfb070b1504162c112f3b9fca Mon Sep 17 00:00:00 2001
From: Matthijs Mekking <matthijs@isc.org>
Date: Thu, 30 Apr 2020 09:33:07 +0200
Subject: [PATCH 2/4] Update run system test doc

---
 doc/dev/dev.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/dev/dev.md b/doc/dev/dev.md
index ba4f530721..7dfef18ced 100644
--- a/doc/dev/dev.md
+++ b/doc/dev/dev.md
@@ -153,8 +153,13 @@ To run only the system tests, omitting unit tests:
         $ cd bin/tests/system
         $ sh runall.sh
 
-Or, to run an individual system test:
+To run an individual system test:
 
+        $ make -C bin/tests/system/ check TESTS=<testname> V=1
+
+Or:
+
+        $ TESTS= make -e all check
         $ cd bin/tests/system
         $ sh run.sh <testname>
 

From 345ac0785de3bd3e55b16567984542039484c5e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
Date: Thu, 30 Apr 2020 09:43:48 +0200
Subject: [PATCH 3/4] Conditionally re-add pkcs11 system test

---
 bin/tests/system/Makefile.am | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index 43d5ea0eaf..a63bbc8915 100644
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -210,6 +210,10 @@ endif HAVE_PYMOD_DNS
 
 endif HAVE_PYTHON
 
+if HAVE_PKCS11
+TESTS += pkcs11
+endif
+
 else !HAVE_PERL
 check:
 	echo Perl is not available, no tests were ran

From b3158207ecd1dc5f90b588b0162f40331883248b Mon Sep 17 00:00:00 2001
From: Matthijs Mekking <matthijs@isc.org>
Date: Thu, 30 Apr 2020 12:09:05 +0200
Subject: [PATCH 4/4] fixup! Add missing system test in Makefile

---
 bin/tests/system/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index a63bbc8915..56daf105d6 100644
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -98,7 +98,7 @@ TESTS = 			\
 	geoip2			\
 	glue			\
 	idna			\
-	include-multipecfg 	\
+	include-multiplecfg 	\
 	inline			\
 	integrity		\
 	kasp			\