Clean up the "glue" system test

Bring the "glue" system test up to speed with other system tests: add
check numbering, ensure test artifacts are preserved upon failure,
improve error reporting, make the test fail upon unexpected errors,
address ShellCheck warnings.

diff --git a/bin/tests/system/glue/clean.sh b/bin/tests/system/glue/clean.sh
index 4d84f068f895a0e46c64d9bc822c1e699568d58e..d6ec3455d68b3303a77c0408f11485f3036051d1 100644 (file)
--- a/bin/tests/system/glue/clean.sh
+++ b/bin/tests/system/glue/clean.sh
@@ -15,9 +15,9 @@
 # Clean up after glue tests.
 #
 
-rm -f dig.out
 rm -f */named.conf
 rm -f */named.memstats
 rm -f */named.run
-rm -f ns*/named.lock
+rm -f dig.out
 rm -f ns*/managed-keys.bind*
+rm -f ns*/named.lock

diff --git a/bin/tests/system/glue/tests.sh b/bin/tests/system/glue/tests.sh
index 9ecf39b6a8a10ce4694c2dd403482424b6706862..e761839a7717211c3b7a353e7e1638247b7b57a3 100644 (file)
--- a/bin/tests/system/glue/tests.sh
+++ b/bin/tests/system/glue/tests.sh
@@ -13,21 +13,30 @@
 
 . ../conf.sh
 
-#
-# Do glue tests.
-#
+set -e
 
-DIGOPTS="+norec -p ${PORT}"
+dig_with_opts() {
+       "$DIG" +norec -p "${PORT}" "$@"
+}
 
 status=0
-
-echo_i "testing that a ccTLD referral gets a full glue set from the root zone"
-$DIG $DIGOPTS @10.53.0.1 foo.bar.fi. A >dig.out || status=1
-digcomp --lc fi.good dig.out || status=1
-
-echo_i "testing that we don't find out-of-zone glue"
-$DIG $DIGOPTS @10.53.0.1 example.net. a > dig.out || status=1
-digcomp noglue.good dig.out || status=1
+n=0
+
+n=$((n+1))
+echo_i "testing that a ccTLD referral gets a full glue set from the root zone ($n)"
+ret=0
+dig_with_opts @10.53.0.1 foo.bar.fi. A > dig.out.$n || ret=1
+digcomp --lc fi.good dig.out.$n || ret=1
+if [ "$ret" -ne 0 ]; then echo_i "failed"; fi
+status=$((status+ret))
+
+n=$((n+1))
+echo_i "testing that we don't find out-of-zone glue ($n)"
+ret=0
+dig_with_opts @10.53.0.1 example.net. A > dig.out.$n || ret=1
+digcomp noglue.good dig.out.$n || ret=1
+if [ "$ret" -ne 0 ]; then echo_i "failed"; fi
+status=$((status+ret))
 
 echo_i "exit status: $status"
 [ $status -eq 0 ] || exit 1