Use prereq.sh for digdelv, dnssec, forward system tests

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index 817a7dc6f1b72f6a8cc5aa32130b11823543a547..b33e4b785e1d3c07b141612948262ec3316c09bc 100644 (file)
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -100,9 +100,11 @@ TESTS +=                   \
        cookie                  \
        database                \
        dialup                  \
+       digdelv                 \
        dispatch                \
        dlzexternal             \
        dns64                   \
+       dnssec                  \
        dnstap                  \
        doth                    \
        dsdigest                \
@@ -115,6 +117,7 @@ TESTS +=                    \
        filter-aaaa             \
        fetchlimit              \
        formerr                 \
+       forward                 \
        geoip2                  \
        glue                    \
        idna                    \
@@ -189,7 +192,6 @@ TESTS +=                    \
 
 if HAVE_PYMOD_DNS
 if HAVE_PERLMOD_NET_DNS
-TESTS += digdelv dnssec forward
 if HAVE_PERLMOD_NET_DNS_NAMESERVER
 TESTS += chain
 endif HAVE_PERLMOD_NET_DNS_NAMESERVER

diff --git a/bin/tests/system/digdelv/prereq.sh b/bin/tests/system/digdelv/prereq.sh
new file mode 100644 (file)
index 0000000..213178a
--- /dev/null
+++ b/bin/tests/system/digdelv/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 ! ${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
+
+exit 0

diff --git a/bin/tests/system/dnssec/prereq.sh b/bin/tests/system/dnssec/prereq.sh
new file mode 100644 (file)
index 0000000..213178a
--- /dev/null
+++ b/bin/tests/system/dnssec/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 ! ${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
+
+exit 0

diff --git a/bin/tests/system/forward/prereq.sh b/bin/tests/system/forward/prereq.sh
new file mode 100644 (file)
index 0000000..213178a
--- /dev/null
+++ b/bin/tests/system/forward/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 ! ${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
+
+exit 0