From: Tom Krizek <tkrizek@isc.org>
Date: Mon, 4 Sep 2023 13:34:05 +0000 (+0200)
Subject: Use prereq.sh for qmin, cookie system tests
X-Git-Tag: v9.19.18~79^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78981cee775f38c23cef7ce49ba680e09527ecee;p=thirdparty%2Fbind9.git

Use prereq.sh for qmin, cookie system tests
---

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index af2c9f0ce97..817a7dc6f1b 100644
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -97,6 +97,7 @@ TESTS +=			\
 	checkds			\
 	checknames		\
 	checkzone		\
+	cookie			\
 	database		\
 	dialup			\
 	dispatch		\
@@ -145,6 +146,7 @@ TESTS +=			\
 	padding			\
 	pending			\
 	pipelined		\
+	qmin			\
 	reclimit		\
 	redirect		\
 	resolver		\
@@ -186,7 +188,6 @@ TESTS +=			\
 	zonechecks
 
 if HAVE_PYMOD_DNS
-TESTS += qmin cookie
 if HAVE_PERLMOD_NET_DNS
 TESTS += digdelv dnssec forward
 if HAVE_PERLMOD_NET_DNS_NAMESERVER
diff --git a/bin/tests/system/cookie/.gitignore b/bin/tests/system/cookie/.gitignore
deleted file mode 100644
index eee491d3c6b..00000000000
--- a/bin/tests/system/cookie/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-prereq.sh
diff --git a/bin/tests/system/cookie/prereq.sh b/bin/tests/system/cookie/prereq.sh
new file mode 100644
index 00000000000..a48d383456d
--- /dev/null
+++ b/bin/tests/system/cookie/prereq.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0.  If a copy of the MPL was not distributed with this
+# file, you can obtain one at https://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+. ../conf.sh
+
+if ! ${PYTHON} -c 'import dns'
+then
+	echo_i "python dns module is required"
+	exit 1
+fi
+
+exit 0
diff --git a/bin/tests/system/qmin/prereq.sh b/bin/tests/system/qmin/prereq.sh
new file mode 100644
index 00000000000..a48d383456d
--- /dev/null
+++ b/bin/tests/system/qmin/prereq.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0.  If a copy of the MPL was not distributed with this
+# file, you can obtain one at https://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+. ../conf.sh
+
+if ! ${PYTHON} -c 'import dns'
+then
+	echo_i "python dns module is required"
+	exit 1
+fi
+
+exit 0