From: Ondřej Surý <ondrej@sury.org>
Date: Thu, 6 Dec 2018 10:07:22 +0000 (+0100)
Subject: Run the digdelv tests with `set -e` enabled
X-Git-Tag: v9.13.6~107^2
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=bc12c52e824bbb1b3d5a92dc3567aca0e35f526b;p=thirdparty%2Fbind9.git

Run the digdelv tests with `set -e` enabled
---

diff --git a/bin/tests/system/digdelv/clean.sh b/bin/tests/system/digdelv/clean.sh
index 7dc50f4264d..d8c360f6203 100644
--- a/bin/tests/system/digdelv/clean.sh
+++ b/bin/tests/system/digdelv/clean.sh
@@ -9,6 +9,8 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+set -e
+
 rm -f ./*/named.memstats
 rm -f ./*/named.run
 rm -f ./*/named.conf
diff --git a/bin/tests/system/digdelv/ns2/sign.sh b/bin/tests/system/digdelv/ns2/sign.sh
index aeeaaabc445..e54f5019bc4 100644
--- a/bin/tests/system/digdelv/ns2/sign.sh
+++ b/bin/tests/system/digdelv/ns2/sign.sh
@@ -12,6 +12,8 @@
 # shellcheck source=conf.sh
 . "$SYSTEMTESTTOP/conf.sh"
 
+set -e
+
 keyname=$("$KEYGEN" -q -a "$DEFAULT_ALGORITHM" -b "$DEFAULT_BITS" -n zone "dnskey.example.")
 
 cp example.db.in example.db
diff --git a/bin/tests/system/digdelv/prereq.sh b/bin/tests/system/digdelv/prereq.sh
index e857356bea3..3db8235fde8 100644
--- a/bin/tests/system/digdelv/prereq.sh
+++ b/bin/tests/system/digdelv/prereq.sh
@@ -12,6 +12,8 @@
 # shellcheck source=conf.sh
 . "$SYSTEMTESTTOP/conf.sh"
 
+set -e
+
 if $PERL -e 'use Net::DNS;' 2>/dev/null
 then
     :
diff --git a/bin/tests/system/digdelv/setup.sh b/bin/tests/system/digdelv/setup.sh
index 20cbfed2450..413b8c6a1f2 100644
--- a/bin/tests/system/digdelv/setup.sh
+++ b/bin/tests/system/digdelv/setup.sh
@@ -12,6 +12,8 @@
 # shellcheck source=conf.sh
 . "$SYSTEMTESTTOP/conf.sh"
 
+set -e
+
 $SHELL clean.sh
 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf
diff --git a/bin/tests/system/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh
index 2c9521edf08..11408b4d7b5 100644
--- a/bin/tests/system/digdelv/tests.sh
+++ b/bin/tests/system/digdelv/tests.sh
@@ -12,6 +12,8 @@
 # shellcheck source=conf.sh
 . "$SYSTEMTESTTOP/conf.sh"
 
+set -e
+
 status=0
 n=0
 
@@ -505,8 +507,8 @@ if [ -x "$DIG" ] ; then
   n=$((n+1))
   echo_i "check that dig gracefully handles bad escape in domain name ($n)"
   ret=0
-  dig_with_opts @10.53.0.3 '\0.' > dig.out.test$n 2>&1
-  digstatus=$?
+  digstatus=0
+  dig_with_opts @10.53.0.3 '\0.' > dig.out.test$n 2>&1 || digstatus=$?
   echo digstatus=$digstatus >> dig.out.test$n
   test $digstatus -eq 10 || ret=1
   grep REQUIRE dig.out.test$n > /dev/null && ret=1
@@ -579,7 +581,7 @@ if [ -x "$DELV" ] ; then
     # following should fail because @IPv4 overrides earlier @IPv6 above
     # and -6 forces IPv6 so this should fail, with a message
     # "Use of IPv4 disabled by -6"
-    delv_with_opts @fd92:7065:b8e:ffff::3 @10.53.0.3 -6 -t txt foo.example > delv.out.test$n 2>&1
+    delv_with_opts @fd92:7065:b8e:ffff::3 @10.53.0.3 -6 -t txt foo.example > delv.out.test$n 2>&1 && ret=1
     # it should have no results but error output
     grep "testing" < delv.out.test$n > /dev/null && ret=1
     grep "Use of IPv4 disabled by -6" delv.out.test$n > /dev/null || ret=1
@@ -597,7 +599,7 @@ if [ -x "$DELV" ] ; then
     # following should fail because @IPv6 overrides earlier @IPv4 above
     # and -4 forces IPv4 so this should fail, with a message
     # "Use of IPv6 disabled by -4"
-    delv_with_opts @10.53.0.3 @fd92:7065:b8e:ffff::3 -4 -t txt foo.example > delv.out.test$n 2>&1
+    delv_with_opts @10.53.0.3 @fd92:7065:b8e:ffff::3 -4 -t txt foo.example > delv.out.test$n 2>&1 && ret=1
     # it should have no results but error output
     grep "testing" delv.out.test$n > /dev/null && ret=1
     grep "Use of IPv6 disabled by -4" delv.out.test$n > /dev/null || ret=1