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 7dc50f4264da47887789fa1437e69be8eb6a50fd..d8c360f62039e31a92eb5336ec7af9624c65c610 100644 (file)
--- 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 aeeaaabc445698e05a86501f9d6813684bc8fdf0..e54f5019bc4cc2f0d3c4e23d32294c76f25461a8 100644 (file)
--- 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 e857356bea3b2f25119cd1e32677e82749c41baf..3db8235fde8e38e8e54f437650a1247c298d9e7c 100644 (file)
--- 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 20cbfed2450b905316f0ad305e975f13609725da..413b8c6a1f244fa250d3fe7f08e55ceb50b1fa59 100644 (file)
--- 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 2c9521edf08b4c4c7fa8a60b11a9fbfed1bdd34f..11408b4d7b55285103661fe0b4a09cbfcef15130 100644 (file)
--- 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