Include conf.sh from all prereq.sh scripts

Every prereq.sh script must include bin/tests/system/conf.sh, otherwise
if some prerequisite is not met, errors about echo_i not being found
will be printed instead of actual error messages.

diff --git a/bin/tests/system/ixfr/prereq.sh b/bin/tests/system/ixfr/prereq.sh
index affe54bfcfc2d3f248f9417b3ee2cb7d6f8cb95a..0e299f4db8fbc512f049d3567eabc62fd4c1cfc1 100644 (file)
--- a/bin/tests/system/ixfr/prereq.sh
+++ b/bin/tests/system/ixfr/prereq.sh
@@ -9,6 +9,9 @@
 # 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
     :

diff --git a/bin/tests/system/statistics/prereq.sh b/bin/tests/system/statistics/prereq.sh
index 9bca4f871d3e51299645474e3a4f09b9e7d8f8a7..ec3fefe08aaaf6ce617de52f1e464e05d593b5fe 100644 (file)
--- a/bin/tests/system/statistics/prereq.sh
+++ b/bin/tests/system/statistics/prereq.sh
@@ -9,6 +9,9 @@
 # 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
     if $PERL -e 'use Net::DNS; die if ($Net::DNS::VERSION >= 0.76 && $Net::DNS::VERSION <= 0.77);' 2>/dev/null

diff --git a/bin/tests/system/statschannel/prereq.sh b/bin/tests/system/statschannel/prereq.sh
index ef052f5580133b12ced65f88feaaaed2b2b4a902..f3d4fd17a62724669190dbc06cc64efb4ba021d1 100644 (file)
--- a/bin/tests/system/statschannel/prereq.sh
+++ b/bin/tests/system/statschannel/prereq.sh
@@ -9,6 +9,9 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
 fail=0
 
 if $PERL -e 'use File::Fetch;' 2>/dev/null

diff --git a/bin/tests/system/upforwd/prereq.sh b/bin/tests/system/upforwd/prereq.sh
index affe54bfcfc2d3f248f9417b3ee2cb7d6f8cb95a..0e299f4db8fbc512f049d3567eabc62fd4c1cfc1 100644 (file)
--- a/bin/tests/system/upforwd/prereq.sh
+++ b/bin/tests/system/upforwd/prereq.sh
@@ -9,6 +9,9 @@
 # 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
     :

diff --git a/bin/tests/system/xfer/prereq.sh b/bin/tests/system/xfer/prereq.sh
index daa3d5d86cc72577634f0326a08e891ff7cd20e0..b8982d610c42229aaf656144e507705459f298c9 100644 (file)
--- a/bin/tests/system/xfer/prereq.sh
+++ b/bin/tests/system/xfer/prereq.sh
@@ -9,6 +9,9 @@
 # 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
     if $PERL -e 'use Net::DNS; die if ($Net::DNS::VERSION >= 0.69 && $Net::DNS::VERSION <= 0.74);' 2>/dev/null