From: Tom Krizek <tkrizek@isc.org>
Date: Mon, 4 Sep 2023 14:05:10 +0000 (+0200)
Subject: Use prereq.sh for chain system test
X-Git-Tag: v9.18.20~45^2~9
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=27c3e576fdcfae311bbfe1062c5c7a881f1643a0;p=thirdparty%2Fbind9.git

Use prereq.sh for chain system test

(cherry picked from commit 5d9a09c08698fe450fa521ce78c40f298beb2e9a)
---

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index 03dc17b32e5..f550411215e 100644
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -106,6 +106,7 @@ TESTS +=			\
 	case			\
 	catz			\
 	cds			\
+	chain			\
 	checkconf		\
 	checkds			\
 	checknames		\
@@ -205,14 +206,6 @@ TESTS +=			\
 	zero			\
 	zonechecks
 
-if HAVE_PYMOD_DNS
-if HAVE_PERLMOD_NET_DNS
-if HAVE_PERLMOD_NET_DNS_NAMESERVER
-TESTS += chain
-endif HAVE_PERLMOD_NET_DNS_NAMESERVER
-endif HAVE_PERLMOD_NET_DNS
-endif HAVE_PYMOD_DNS
-
 else !HAVE_PYTEST
 check:
 	echo pytest is not available, no tests were ran
diff --git a/bin/tests/system/chain/prereq.sh b/bin/tests/system/chain/prereq.sh
new file mode 100644
index 00000000000..ae09abfe3f9
--- /dev/null
+++ b/bin/tests/system/chain/prereq.sh
@@ -0,0 +1,34 @@
+#!/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
+
+if ! ${PERL} -MNet::DNS -e ''
+then
+	echo_i "perl Net::DNS module is required"
+	exit 1
+fi
+
+if ! ${PERL} -MNet::DNS::Nameserver -e ''
+then
+	echo_i "perl Net::DNS::Nameserver module is required"
+	exit 1
+fi
+
+exit 0
diff --git a/configure.ac b/configure.ac
index 9be625d50ce..9c6186417dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -241,10 +241,6 @@ AX_PERL_MODULE([Net::DNS])
 AM_CONDITIONAL([HAVE_PERLMOD_NET_DNS],
 	       [test "$HAVE_PERLMOD_NET__DNS" = "yes"])
 
-AX_PERL_MODULE([Net::DNS::Nameserver])
-AM_CONDITIONAL([HAVE_PERLMOD_NET_DNS_NAMESERVER],
-	       [test "$HAVE_PERLMOD_NET__DNS__NAMESERVER" = "yes"])
-
 AX_PERL_MODULE([Time::HiRes])
 AM_CONDITIONAL([HAVE_PERLMOD_TIME_HIRES],
 	       [test "$HAVE_PERLMOD_TIME__HIRES" = "yes"])
@@ -261,9 +257,6 @@ AS_IF([test -z "$PYTEST"],
 AC_SUBST([PYTEST])
 AM_CONDITIONAL([HAVE_PYTEST], [test -n "$PYTEST"])
 
-AX_PYTHON_MODULE([dns])
-AM_CONDITIONAL([HAVE_PYMOD_DNS], [test "$HAVE_PYMOD_DNS" = "yes"])
-
 #
 # xsltproc is optional, it is used only by system test scripts.
 #