Use prereq.sh for statschannel system test

(cherry picked from commit 27281955afe901d2705829edc8c327043cd689fd)

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index af5795f5fcfdc8d98cdfe1e40630cb879e012357..4907c1e37dc0a24fce4fca337498aa1166c5b51c 100644 (file)
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -177,6 +177,7 @@ TESTS +=                    \
        spf                     \
        staticstub              \
        statistics              \
+       statschannel            \
        stress                  \
        stub                    \
        synthfromdnssec         \
@@ -199,10 +200,6 @@ TESTS +=                   \
 
 if HAVE_PERLMOD_NET_DNS
 
-if HAVE_PERLMOD_FILE_FETCH
-TESTS += statschannel
-endif HAVE_PERLMOD_FILE_FETCH
-
 if HAVE_PERLMOD_DIGEST_HMAC
 TESTS += xfer
 endif HAVE_PERLMOD_DIGEST_HMAC

diff --git a/bin/tests/system/statschannel/prereq.sh b/bin/tests/system/statschannel/prereq.sh
new file mode 100644 (file)
index 0000000..77d0c38
--- /dev/null
+++ b/bin/tests/system/statschannel/prereq.sh
@@ -0,0 +1,28 @@
+#!/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
+
+if ! ${PERL} -MFile::Fetch -e ''
+then
+       echo_i "perl File::Fetch module is required"
+       exit 1
+fi
+
+exit 0

diff --git a/configure.ac b/configure.ac
index 263014e51bfbbcd5f42bd56c85e225f94715511d..c26265a7dfff5eda19a45055a5cc61b90173483d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -241,10 +241,6 @@ AX_PERL_MODULE([Digest::HMAC])
 AM_CONDITIONAL([HAVE_PERLMOD_DIGEST_HMAC],
               [test "$HAVE_PERLMOD_DIGEST__HMAC" = "yes"])
 
-AX_PERL_MODULE([File::Fetch])
-AM_CONDITIONAL([HAVE_PERLMOD_FILE_FETCH],
-              [test "$HAVE_PERLMOD_FILE__FETCH" = "yes"])
-
 AX_PERL_MODULE([Net::DNS])
 AM_CONDITIONAL([HAVE_PERLMOD_NET_DNS],
               [test "$HAVE_PERLMOD_NET__DNS" = "yes"])