From: Tom Krizek <tkrizek@isc.org>
Date: Mon, 4 Sep 2023 14:03:05 +0000 (+0200)
Subject: Use prereq.sh for rpzrecurse system test
X-Git-Tag: v9.19.18~79^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0538b7e0da4acdafc9a1fa2f6e6872481ffdd2d1;p=thirdparty%2Fbind9.git

Use prereq.sh for rpzrecurse system test
---

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index f61001a6cc6..d21d2b03056 100644
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -70,14 +70,7 @@ rpz_dnsrps_LDADD =		\
 	$(LIBDNS_LIBS)		\
 	$(DLOPEN_LIBS)
 
-TESTS =
-
-if HAVE_PERLMOD_NET_DNS
-TESTS +=		\
-	rpzrecurse
-endif HAVE_PERLMOD_NET_DNS
-
-TESTS +=			\
+TESTS =				\
 	acl			\
 	additional		\
 	addzone			\
@@ -154,6 +147,7 @@ TESTS +=			\
 	rootkeysentinel		\
 	rpz			\
 	rpzextra		\
+	rpzrecurse		\
 	rrchecker		\
 	rrl			\
 	rrsetorder		\
diff --git a/bin/tests/system/rpzrecurse/prereq.sh b/bin/tests/system/rpzrecurse/prereq.sh
new file mode 100644
index 00000000000..0c29427e978
--- /dev/null
+++ b/bin/tests/system/rpzrecurse/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 ! ${PERL} -MNet::DNS -e ''
+then
+	echo_i "perl Net::DNS module is required"
+	exit 1
+fi
+
+exit 0
diff --git a/configure.ac b/configure.ac
index 5e7288a1062..e6d286c1617 100644
--- a/configure.ac
+++ b/configure.ac
@@ -311,10 +311,6 @@ AC_PATH_PROGS([PERL], [perl5 perl])
 AC_SUBST([PERL])
 AM_CONDITIONAL([HAVE_PERL], [test -n "$PERL"])
 
-AX_PERL_MODULE([Net::DNS])
-AM_CONDITIONAL([HAVE_PERLMOD_NET_DNS],
-	       [test "$HAVE_PERLMOD_NET__DNS" = "yes"])
-
 #
 # Python is optional, it is used only by some of the system test scripts.
 #