From: Kevin Chen <kechen@akamai.com>
Date: Wed, 28 Feb 2018 22:07:44 +0000 (-0500)
Subject: Add a Net::DNS prereq for digdelv, fetchlimit, rpzrecurse, and zero
X-Git-Tag: v9.13.0~75^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b1b809ab4d77b6c644ab7df713f32da50fd8348;p=thirdparty%2Fbind9.git

Add a Net::DNS prereq for digdelv, fetchlimit, rpzrecurse, and zero
tests to avoid failed tests when Net::DNS is not present.
---

diff --git a/bin/tests/system/digdelv/prereq.sh b/bin/tests/system/digdelv/prereq.sh
new file mode 100644
index 00000000000..de147a4c2af
--- /dev/null
+++ b/bin/tests/system/digdelv/prereq.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# 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 http://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+if $PERL -e 'use Net::DNS;' 2>/dev/null
+then
+    :
+else
+    echo "I:This test requires the Net::DNS library." >&2
+    exit 1
+fi
diff --git a/bin/tests/system/fetchlimit/prereq.sh b/bin/tests/system/fetchlimit/prereq.sh
new file mode 100644
index 00000000000..de147a4c2af
--- /dev/null
+++ b/bin/tests/system/fetchlimit/prereq.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# 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 http://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+if $PERL -e 'use Net::DNS;' 2>/dev/null
+then
+    :
+else
+    echo "I:This test requires the Net::DNS library." >&2
+    exit 1
+fi
diff --git a/bin/tests/system/rpzrecurse/prereq.sh b/bin/tests/system/rpzrecurse/prereq.sh
index a0d4e9ce14a..f121b574116 100644
--- a/bin/tests/system/rpzrecurse/prereq.sh
+++ b/bin/tests/system/rpzrecurse/prereq.sh
@@ -12,4 +12,12 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-exec $SHELL ../testcrypto.sh
+$SHELL ../testcrypto.sh || exit 255
+
+if $PERL -e 'use Net::DNS;' 2>/dev/null
+then
+    :
+else
+    echo "I:This test requires the Net::DNS library." >&2
+    exit 1
+fi
diff --git a/bin/tests/system/zero/prereq.sh b/bin/tests/system/zero/prereq.sh
new file mode 100644
index 00000000000..de147a4c2af
--- /dev/null
+++ b/bin/tests/system/zero/prereq.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# 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 http://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+if $PERL -e 'use Net::DNS;' 2>/dev/null
+then
+    :
+else
+    echo "I:This test requires the Net::DNS library." >&2
+    exit 1
+fi
diff --git a/util/copyrights b/util/copyrights
index e32ce18611d..00479c0daff 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -910,6 +910,7 @@
 ./bin/tests/system/digdelv/ns2/example.db	ZONE	2015,2016,2018
 ./bin/tests/system/digdelv/ns2/named.conf.in	CONF-C	2015,2016,2018
 ./bin/tests/system/digdelv/ns3/named.conf.in	CONF-C	2015,2016,2017,2018
+./bin/tests/system/digdelv/prereq.sh		SH	2018
 ./bin/tests/system/digdelv/setup.sh		SH	2018
 ./bin/tests/system/digdelv/tests.sh		SH	2015,2016,2017,2018
 ./bin/tests/system/ditch.pl			PERL	2015,2016,2018
@@ -1240,6 +1241,7 @@
 ./bin/tests/system/fetchlimit/ns3/named2.conf.in	CONF-C	2015,2016,2018
 ./bin/tests/system/fetchlimit/ns3/named3.conf.in	CONF-C	2015,2016,2018
 ./bin/tests/system/fetchlimit/ns3/root.hint	ZONE	2015,2016,2018
+./bin/tests/system/fetchlimit/prereq.sh		SH	2018
 ./bin/tests/system/fetchlimit/setup.sh		SH	2015,2016,2018
 ./bin/tests/system/fetchlimit/tests.sh		SH	2015,2016,2018
 ./bin/tests/system/filter-aaaa/.gitignore	X	2012,2014,2016,2018
@@ -2328,6 +2330,7 @@
 ./bin/tests/system/zero/ns3/root.hint		ZONE	2013,2016,2018
 ./bin/tests/system/zero/ns4/named.conf.in	CONF-C	2013,2016,2017,2018
 ./bin/tests/system/zero/ns4/one.tld.db		ZONE	2016,2018
+./bin/tests/system/zero/prereq.sh		SH	2018
 ./bin/tests/system/zero/setup.sh		SH	2013,2014,2016,2018
 ./bin/tests/system/zero/tests.sh		SH	2013,2016,2017,2018
 ./bin/tests/system/zonechecks/a.db		ZONE	2004,2007,2016,2018