From dbfb3a18c8dd3cbe95bd180abeb1e2ae0445efa3 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Mon, 4 May 2015 12:52:28 -0700 Subject: [PATCH] [v9_10] check for Net::DNS 4113. [test] Check for Net::DNS is some system test prerequisites. [RT #39369] --- CHANGES | 3 +++ bin/tests/system/reclimit/prereq.sh | 26 ++++++++++++++++++++++++++ bin/tests/system/stress/prereq.sh | 26 ++++++++++++++++++++++++++ bin/tests/system/stress/tests.sh | 8 -------- 4 files changed, 55 insertions(+), 8 deletions(-) create mode 100644 bin/tests/system/reclimit/prereq.sh create mode 100644 bin/tests/system/stress/prereq.sh diff --git a/CHANGES b/CHANGES index 3bba58409c..20ffb3cbd0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +4113. [test] Check for Net::DNS is some system test + prerequisites. [RT #39369] + 4112. [bug] Named failed to load when "root-delegation-only" was used without a list of domains to exclude. [RT #39380] diff --git a/bin/tests/system/reclimit/prereq.sh b/bin/tests/system/reclimit/prereq.sh new file mode 100644 index 0000000000..7f90cf9c16 --- /dev/null +++ b/bin/tests/system/reclimit/prereq.sh @@ -0,0 +1,26 @@ +#!/bin/sh +# +# Copyright (C) 2015 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh + +if $PERL -e 'use Net::DNS::Nameserver;' 2>/dev/null +then + : +else + echo "I:This test requires the Net::DNS::Nameserver library." >&2 + exit 1 +fi diff --git a/bin/tests/system/stress/prereq.sh b/bin/tests/system/stress/prereq.sh new file mode 100644 index 0000000000..66559f846b --- /dev/null +++ b/bin/tests/system/stress/prereq.sh @@ -0,0 +1,26 @@ +#!/bin/sh +# +# Copyright (C) 2015 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +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/stress/tests.sh b/bin/tests/system/stress/tests.sh index 056e09c567..09f4cf6346 100644 --- a/bin/tests/system/stress/tests.sh +++ b/bin/tests/system/stress/tests.sh @@ -20,14 +20,6 @@ SYSTEMTESTTOP=.. status=0 -if $PERL -e 'use Net::DNS;' 2>/dev/null -then - : -else - echo "I:This test requires the Net::DNS library." >&2 - exit 1 -fi - ( $SHELL -c "while true do $RNDC -c ../common/rndc.conf -s 10.53.0.3 -p 9953 reload 2>&1 |