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

Use prereq.sh for xfer system test

(cherry picked from commit 587129b4c0537ea9159bad5b887b945d9811006c)
---

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index 4907c1e37dc..0574f69f458 100644
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -194,16 +194,13 @@ TESTS +=			\
 	verify			\
 	views			\
 	wildcard		\
+	xfer			\
 	xferquota		\
 	zero			\
 	zonechecks
 
 if HAVE_PERLMOD_NET_DNS
 
-if HAVE_PERLMOD_DIGEST_HMAC
-TESTS += xfer
-endif HAVE_PERLMOD_DIGEST_HMAC
-
 if HAVE_PERLMOD_NET_DNS_NAMESERVER
 TESTS += reclimit
 endif HAVE_PERLMOD_NET_DNS_NAMESERVER
diff --git a/bin/tests/system/xfer/prereq.sh b/bin/tests/system/xfer/prereq.sh
index 16d04a26bd9..76252a3cd86 100644
--- a/bin/tests/system/xfer/prereq.sh
+++ b/bin/tests/system/xfer/prereq.sh
@@ -23,4 +23,10 @@ then
 	exit 1
 fi
 
+if ! ${PERL} -MDigest::HMAC -e ''
+then
+	echo_i "perl Digest::HMAC module is required"
+	exit 1
+fi
+
 exit 0
diff --git a/configure.ac b/configure.ac
index c26265a7dff..9be625d50ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -237,10 +237,6 @@ AC_PATH_PROGS([PERL], [perl5 perl])
 AC_SUBST([PERL])
 AM_CONDITIONAL([HAVE_PERL], [test -n "$PERL"])
 
-AX_PERL_MODULE([Digest::HMAC])
-AM_CONDITIONAL([HAVE_PERLMOD_DIGEST_HMAC],
-	       [test "$HAVE_PERLMOD_DIGEST__HMAC" = "yes"])
-
 AX_PERL_MODULE([Net::DNS])
 AM_CONDITIONAL([HAVE_PERLMOD_NET_DNS],
 	       [test "$HAVE_PERLMOD_NET__DNS" = "yes"])