From: Tom Krizek Date: Wed, 7 Jun 2023 13:35:57 +0000 (+0200) Subject: Run system tests with set -e X-Git-Tag: v9.19.16~45^2~31 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01bc805f898a29ad89bd9499114298887a9f69fe;p=thirdparty%2Fbind9.git Run system tests with set -e Ensure all shell system tests are executed with the errexit option set. This prevents unchecked return codes from commands in the test from interfering with the tests, since any failures need to be handled explicitly. --- diff --git a/bin/tests/system/acl/tests.sh b/bin/tests/system/acl/tests.sh index 0984d85ed9a..f4e8d7c82f5 100644 --- a/bin/tests/system/acl/tests.sh +++ b/bin/tests/system/acl/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="+tcp +noadd +nosea +nostat +noquest +nocomm +nocmd -p ${PORT}" diff --git a/bin/tests/system/additional/tests.sh b/bin/tests/system/additional/tests.sh index 6cede72372e..d42b143cb66 100644 --- a/bin/tests/system/additional/tests.sh +++ b/bin/tests/system/additional/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="-p ${PORT}" diff --git a/bin/tests/system/addzone/tests.sh b/bin/tests/system/addzone/tests.sh index e626c5cd9e0..d50829929e2 100755 --- a/bin/tests/system/addzone/tests.sh +++ b/bin/tests/system/addzone/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="+tcp +nosea +nostat +nocmd +norec +noques +noauth +noadd +nostats +dnssec -p ${PORT}" diff --git a/bin/tests/system/allow-query/tests.sh b/bin/tests/system/allow-query/tests.sh index 74a372e79f6..b69b15f02d3 100644 --- a/bin/tests/system/allow-query/tests.sh +++ b/bin/tests/system/allow-query/tests.sh @@ -52,6 +52,8 @@ # and querying as necessary. # +set -e + . ../conf.sh DIGOPTS="+tcp +nosea +nostat +nocmd +norec +noques +noauth +noadd +nostats +dnssec -p ${PORT}" diff --git a/bin/tests/system/auth/tests.sh b/bin/tests/system/auth/tests.sh index b67752279bc..d3fb104eef8 100644 --- a/bin/tests/system/auth/tests.sh +++ b/bin/tests/system/auth/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="+tcp -p ${PORT}" diff --git a/bin/tests/system/autosign/tests.sh b/bin/tests/system/autosign/tests.sh index d490adb381f..36dbd26ff85 100755 --- a/bin/tests/system/autosign/tests.sh +++ b/bin/tests/system/autosign/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/builtin/tests.sh b/bin/tests/system/builtin/tests.sh index 898fd522e9f..bb4ee47d2ff 100644 --- a/bin/tests/system/builtin/tests.sh +++ b/bin/tests/system/builtin/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="-p ${PORT}" diff --git a/bin/tests/system/cacheclean/tests.sh b/bin/tests/system/cacheclean/tests.sh index 1192dd97d77..cbb36ccf89c 100755 --- a/bin/tests/system/cacheclean/tests.sh +++ b/bin/tests/system/cacheclean/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/case/tests.sh b/bin/tests/system/case/tests.sh index 2e9dc7d729e..b17eaef9e48 100644 --- a/bin/tests/system/case/tests.sh +++ b/bin/tests/system/case/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="+tcp +nosea +nostat +noquest +nocomm +nocmd -p ${PORT}" diff --git a/bin/tests/system/cds/tests.sh b/bin/tests/system/cds/tests.sh index 49a428b8db7..312197ace51 100644 --- a/bin/tests/system/cds/tests.sh +++ b/bin/tests/system/cds/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/chain/tests.sh b/bin/tests/system/chain/tests.sh index bbfb3ea3c50..c8bd8b017a8 100644 --- a/bin/tests/system/chain/tests.sh +++ b/bin/tests/system/chain/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="-p ${PORT}" diff --git a/bin/tests/system/checkconf/tests.sh b/bin/tests/system/checkconf/tests.sh index 6baf65bff0b..0c7e583d6be 100644 --- a/bin/tests/system/checkconf/tests.sh +++ b/bin/tests/system/checkconf/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/checknames/tests.sh b/bin/tests/system/checknames/tests.sh index 085e228b9ee..f4f87969a62 100644 --- a/bin/tests/system/checknames/tests.sh +++ b/bin/tests/system/checknames/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/checkzone/tests.sh b/bin/tests/system/checkzone/tests.sh index 9d575ee6d92..169e411c9e9 100644 --- a/bin/tests/system/checkzone/tests.sh +++ b/bin/tests/system/checkzone/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/cookie/tests.sh b/bin/tests/system/cookie/tests.sh index 9eeb3243e42..fff1b558800 100755 --- a/bin/tests/system/cookie/tests.sh +++ b/bin/tests/system/cookie/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="-p ${PORT}" diff --git a/bin/tests/system/database/tests.sh b/bin/tests/system/database/tests.sh index bb77de73292..5c1f8676d1d 100644 --- a/bin/tests/system/database/tests.sh +++ b/bin/tests/system/database/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/dialup/tests.sh b/bin/tests/system/dialup/tests.sh index 3a8f5e89806..c578f0fd4e5 100644 --- a/bin/tests/system/dialup/tests.sh +++ b/bin/tests/system/dialup/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh index eb551f98b92..9a392d377d2 100644 --- a/bin/tests/system/digdelv/tests.sh +++ b/bin/tests/system/digdelv/tests.sh @@ -11,11 +11,11 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + # shellcheck source=conf.sh . ../conf.sh -set -e - status=0 n=0 diff --git a/bin/tests/system/dlzexternal/tests.sh b/bin/tests/system/dlzexternal/tests.sh index 9fd1ebe179e..a290bef5774 100644 --- a/bin/tests/system/dlzexternal/tests.sh +++ b/bin/tests/system/dlzexternal/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/dns64/tests.sh b/bin/tests/system/dns64/tests.sh index e878c77ea55..b47aa0b004f 100644 --- a/bin/tests/system/dns64/tests.sh +++ b/bin/tests/system/dns64/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh index bb04e363260..5e272ac1ace 100644 --- a/bin/tests/system/dnssec/tests.sh +++ b/bin/tests/system/dnssec/tests.sh @@ -11,11 +11,11 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + # shellcheck source=conf.sh . ../conf.sh -set -e - status=0 n=1 diff --git a/bin/tests/system/dnstap/tests.sh b/bin/tests/system/dnstap/tests.sh index 5936657d5a3..f50f0fb8399 100644 --- a/bin/tests/system/dnstap/tests.sh +++ b/bin/tests/system/dnstap/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="+short -p ${PORT}" diff --git a/bin/tests/system/doth/tests.sh b/bin/tests/system/doth/tests.sh index eb631319c95..59908ce4c39 100644 --- a/bin/tests/system/doth/tests.sh +++ b/bin/tests/system/doth/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + # shellcheck disable=SC1091 . ../conf.sh diff --git a/bin/tests/system/dsdigest/tests.sh b/bin/tests/system/dsdigest/tests.sh index bcf8491f081..0a1aab6a5a3 100644 --- a/bin/tests/system/dsdigest/tests.sh +++ b/bin/tests/system/dsdigest/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/dupsigs/tests.sh b/bin/tests/system/dupsigs/tests.sh index 29d2ab7d33a..5d44d53d502 100644 --- a/bin/tests/system/dupsigs/tests.sh +++ b/bin/tests/system/dupsigs/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/dyndb/tests.sh b/bin/tests/system/dyndb/tests.sh index 31bb2207826..5b761e560d2 100644 --- a/bin/tests/system/dyndb/tests.sh +++ b/bin/tests/system/dyndb/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/ednscompliance/tests.sh b/bin/tests/system/ednscompliance/tests.sh index 6bd7dafcda6..21cc2fe2081 100644 --- a/bin/tests/system/ednscompliance/tests.sh +++ b/bin/tests/system/ednscompliance/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="+norec -p ${PORT}" diff --git a/bin/tests/system/emptyzones/tests.sh b/bin/tests/system/emptyzones/tests.sh index bda0bf87fc7..ac4d02aada5 100644 --- a/bin/tests/system/emptyzones/tests.sh +++ b/bin/tests/system/emptyzones/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="-p ${PORT}" diff --git a/bin/tests/system/enginepkcs11/tests.sh b/bin/tests/system/enginepkcs11/tests.sh index 256ae2eef35..f8f0317d9b7 100644 --- a/bin/tests/system/enginepkcs11/tests.sh +++ b/bin/tests/system/enginepkcs11/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + # shellcheck source=conf.sh . ../conf.sh diff --git a/bin/tests/system/fetchlimit/tests.sh b/bin/tests/system/fetchlimit/tests.sh index 4bf0f6fb0c7..edb1ba185fc 100644 --- a/bin/tests/system/fetchlimit/tests.sh +++ b/bin/tests/system/fetchlimit/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGCMD="$DIG @10.53.0.3 -p ${PORT} +tcp +tries=1 +time=1" diff --git a/bin/tests/system/filter-aaaa/tests.sh b/bin/tests/system/filter-aaaa/tests.sh index 93e4ad9b50f..1e4f810712b 100644 --- a/bin/tests/system/filter-aaaa/tests.sh +++ b/bin/tests/system/filter-aaaa/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/formerr/tests.sh b/bin/tests/system/formerr/tests.sh index 870594b69c0..0d9a74fb4d0 100644 --- a/bin/tests/system/formerr/tests.sh +++ b/bin/tests/system/formerr/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/forward/tests.sh b/bin/tests/system/forward/tests.sh index 1f143e558a1..48c461ab80e 100644 --- a/bin/tests/system/forward/tests.sh +++ b/bin/tests/system/forward/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + #shellcheck source=conf.sh . ../conf.sh diff --git a/bin/tests/system/geoip2/tests.sh b/bin/tests/system/geoip2/tests.sh index 516f9bbf244..58edfb9fe12 100644 --- a/bin/tests/system/geoip2/tests.sh +++ b/bin/tests/system/geoip2/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/glue/tests.sh b/bin/tests/system/glue/tests.sh index 4d750b04bed..49983fbfdbc 100644 --- a/bin/tests/system/glue/tests.sh +++ b/bin/tests/system/glue/tests.sh @@ -11,10 +11,10 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. -. ../conf.sh - set -e +. ../conf.sh + dig_with_opts() { "$DIG" +norec -p "${PORT}" "$@" } diff --git a/bin/tests/system/idna/tests.sh b/bin/tests/system/idna/tests.sh index f73da79215c..594cb053b4d 100644 --- a/bin/tests/system/idna/tests.sh +++ b/bin/tests/system/idna/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh # Set known locale for the tests diff --git a/bin/tests/system/include-multiplecfg/tests.sh b/bin/tests/system/include-multiplecfg/tests.sh index 34d37857667..cb2f28ef0f6 100644 --- a/bin/tests/system/include-multiplecfg/tests.sh +++ b/bin/tests/system/include-multiplecfg/tests.sh @@ -13,6 +13,7 @@ # Test of include statement with glob expression. +set -e . ../conf.sh diff --git a/bin/tests/system/inline/tests.sh b/bin/tests/system/inline/tests.sh index 32436b0b5e1..423cfc64fe4 100755 --- a/bin/tests/system/inline/tests.sh +++ b/bin/tests/system/inline/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="+tcp +dnssec -p ${PORT}" diff --git a/bin/tests/system/integrity/tests.sh b/bin/tests/system/integrity/tests.sh index 6754dd00f0c..998e04f6816 100644 --- a/bin/tests/system/integrity/tests.sh +++ b/bin/tests/system/integrity/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="-p ${PORT}" diff --git a/bin/tests/system/ixfr/tests.sh b/bin/tests/system/ixfr/tests.sh index 65d5a484652..3c798bda9d5 100644 --- a/bin/tests/system/ixfr/tests.sh +++ b/bin/tests/system/ixfr/tests.sh @@ -16,6 +16,8 @@ # in the log file - need a better approach - until then, # if you add any tests above that point, you will break the test. +set -e + . ../conf.sh wait_for_serial() ( diff --git a/bin/tests/system/journal/tests.sh b/bin/tests/system/journal/tests.sh index f6e0f4d8095..4cdf415185b 100644 --- a/bin/tests/system/journal/tests.sh +++ b/bin/tests/system/journal/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh dig_with_opts() { diff --git a/bin/tests/system/kasp/tests.sh b/bin/tests/system/kasp/tests.sh index 5d383feb51d..e4e4ffe9e28 100644 --- a/bin/tests/system/kasp/tests.sh +++ b/bin/tests/system/kasp/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + # shellcheck source=conf.sh . ../conf.sh # shellcheck source=kasp.sh diff --git a/bin/tests/system/keepalive/tests.sh b/bin/tests/system/keepalive/tests.sh index 124ca24acd6..12a1cc0bfc0 100644 --- a/bin/tests/system/keepalive/tests.sh +++ b/bin/tests/system/keepalive/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="-p ${PORT}" diff --git a/bin/tests/system/keyfromlabel/tests.sh b/bin/tests/system/keyfromlabel/tests.sh index c0a3c0aeba3..5cedbf93d16 100644 --- a/bin/tests/system/keyfromlabel/tests.sh +++ b/bin/tests/system/keyfromlabel/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + # shellcheck source=conf.sh . ../conf.sh diff --git a/bin/tests/system/keymgr2kasp/tests.sh b/bin/tests/system/keymgr2kasp/tests.sh index 574347e14a1..6f9caae5646 100644 --- a/bin/tests/system/keymgr2kasp/tests.sh +++ b/bin/tests/system/keymgr2kasp/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + # shellcheck source=conf.sh . ../conf.sh # shellcheck source=kasp.sh diff --git a/bin/tests/system/legacy/tests.sh b/bin/tests/system/legacy/tests.sh index 0bddac8a75f..f98323b2fb1 100755 --- a/bin/tests/system/legacy/tests.sh +++ b/bin/tests/system/legacy/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="-p ${PORT} +tries=1 +time=2" diff --git a/bin/tests/system/limits/tests.sh b/bin/tests/system/limits/tests.sh index f4149fcb57f..f2cf0fb5bbe 100644 --- a/bin/tests/system/limits/tests.sh +++ b/bin/tests/system/limits/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="-p ${PORT}" diff --git a/bin/tests/system/logfileconfig/tests.sh b/bin/tests/system/logfileconfig/tests.sh index 3abf17540ad..fdd9df95ece 100644 --- a/bin/tests/system/logfileconfig/tests.sh +++ b/bin/tests/system/logfileconfig/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh # Test given condition. If true, test again after a second. Used for testing diff --git a/bin/tests/system/masterfile/tests.sh b/bin/tests/system/masterfile/tests.sh index 6ca4ea5b0a4..b3ed3994486 100644 --- a/bin/tests/system/masterfile/tests.sh +++ b/bin/tests/system/masterfile/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="-p ${PORT}" diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh index 7c52bd4c664..1bcddd60dec 100755 --- a/bin/tests/system/masterformat/tests.sh +++ b/bin/tests/system/masterformat/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + # shellcheck source=conf.sh . ../conf.sh diff --git a/bin/tests/system/metadata/tests.sh b/bin/tests/system/metadata/tests.sh index e8d442366aa..38141b27a18 100644 --- a/bin/tests/system/metadata/tests.sh +++ b/bin/tests/system/metadata/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh pzone=parent.nil pfile=parent.db diff --git a/bin/tests/system/mirror/tests.sh b/bin/tests/system/mirror/tests.sh index cc4be2d93a7..91277a42557 100644 --- a/bin/tests/system/mirror/tests.sh +++ b/bin/tests/system/mirror/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="-p ${PORT} -b 10.53.0.1 +dnssec +time=2 +tries=1 +multi" diff --git a/bin/tests/system/multisigner/tests.sh b/bin/tests/system/multisigner/tests.sh index 1b3d6cbc903..3fa4a533988 100644 --- a/bin/tests/system/multisigner/tests.sh +++ b/bin/tests/system/multisigner/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + # shellcheck source=conf.sh . ../conf.sh # shellcheck source=kasp.sh diff --git a/bin/tests/system/names/tests.sh b/bin/tests/system/names/tests.sh index d6495707a7f..5e22347a693 100644 --- a/bin/tests/system/names/tests.sh +++ b/bin/tests/system/names/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="+nosea +stat +noquest +nocomm +nocmd -p ${PORT}" diff --git a/bin/tests/system/notify/tests.sh b/bin/tests/system/notify/tests.sh index 1d62c035dc1..d2fa8a0ecc2 100644 --- a/bin/tests/system/notify/tests.sh +++ b/bin/tests/system/notify/tests.sh @@ -11,8 +11,9 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. -# shellcheck disable=SC2034 +set -e +# shellcheck disable=SC2034 . ../conf.sh dig_plus_opts() { diff --git a/bin/tests/system/nsec3/tests.sh b/bin/tests/system/nsec3/tests.sh index 93a99e0b22d..6b1e84b489d 100644 --- a/bin/tests/system/nsec3/tests.sh +++ b/bin/tests/system/nsec3/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + # shellcheck source=conf.sh . ../conf.sh # shellcheck source=kasp.sh diff --git a/bin/tests/system/nslookup/tests.sh b/bin/tests/system/nslookup/tests.sh index 1978eb40f30..da11016c569 100644 --- a/bin/tests/system/nslookup/tests.sh +++ b/bin/tests/system/nslookup/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + # shellcheck disable=SC2086 . ../conf.sh diff --git a/bin/tests/system/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh index c8de7911b28..9fefe34fb0a 100755 --- a/bin/tests/system/nsupdate/tests.sh +++ b/bin/tests/system/nsupdate/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="-p ${PORT}" diff --git a/bin/tests/system/nzd2nzf/tests.sh b/bin/tests/system/nzd2nzf/tests.sh index 2d6498d4d5e..2cfc58f0f16 100644 --- a/bin/tests/system/nzd2nzf/tests.sh +++ b/bin/tests/system/nzd2nzf/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh dig_with_opts() { diff --git a/bin/tests/system/padding/tests.sh b/bin/tests/system/padding/tests.sh index 9fe2a263054..c09361ac789 100644 --- a/bin/tests/system/padding/tests.sh +++ b/bin/tests/system/padding/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh n=0 diff --git a/bin/tests/system/pending/tests.sh b/bin/tests/system/pending/tests.sh index baaacd4d797..1e73bc3c5d1 100644 --- a/bin/tests/system/pending/tests.sh +++ b/bin/tests/system/pending/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh # replace_data dname RR old_data new_data diff --git a/bin/tests/system/pipelined/tests.sh b/bin/tests/system/pipelined/tests.sh index df89da1b074..0fc513ba97f 100644 --- a/bin/tests/system/pipelined/tests.sh +++ b/bin/tests/system/pipelined/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh mdig_with_opts() { diff --git a/bin/tests/system/qmin/tests.sh b/bin/tests/system/qmin/tests.sh index 12d74518fcd..b8d31285c0d 100755 --- a/bin/tests/system/qmin/tests.sh +++ b/bin/tests/system/qmin/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="-p ${PORT}" diff --git a/bin/tests/system/reclimit/tests.sh b/bin/tests/system/reclimit/tests.sh index de1dacb2421..429e4aa5c1c 100644 --- a/bin/tests/system/reclimit/tests.sh +++ b/bin/tests/system/reclimit/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="-p ${PORT}" diff --git a/bin/tests/system/redirect/tests.sh b/bin/tests/system/redirect/tests.sh index 7201ff23993..8572cc62205 100644 --- a/bin/tests/system/redirect/tests.sh +++ b/bin/tests/system/redirect/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh index 2af36cc86e7..89851b2efa8 100755 --- a/bin/tests/system/resolver/tests.sh +++ b/bin/tests/system/resolver/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + # shellcheck source=../conf.sh . ../conf.sh diff --git a/bin/tests/system/rndc/tests.sh b/bin/tests/system/rndc/tests.sh index 5eed39e7225..379a2c17665 100644 --- a/bin/tests/system/rndc/tests.sh +++ b/bin/tests/system/rndc/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="+tcp +noadd +nosea +nostat +noquest +nocomm +nocmd" diff --git a/bin/tests/system/rootkeysentinel/tests.sh b/bin/tests/system/rootkeysentinel/tests.sh index a3ad7a22396..ecc1b3ea06a 100644 --- a/bin/tests/system/rootkeysentinel/tests.sh +++ b/bin/tests/system/rootkeysentinel/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/rpz/tests.sh b/bin/tests/system/rpz/tests.sh index bb03c1438e5..cc0f9df6768 100644 --- a/bin/tests/system/rpz/tests.sh +++ b/bin/tests/system/rpz/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + # test response policy zones (RPZ) # touch dnsrps-off to not test with DNSRPS diff --git a/bin/tests/system/rpzrecurse/tests.sh b/bin/tests/system/rpzrecurse/tests.sh index a5802bc0e2d..5e06135df6a 100644 --- a/bin/tests/system/rpzrecurse/tests.sh +++ b/bin/tests/system/rpzrecurse/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + # touch dnsrps-off to not test with DNSRPS # touch dnsrps-only to not test with classic RPZ diff --git a/bin/tests/system/rrchecker/tests.sh b/bin/tests/system/rrchecker/tests.sh index 0e493eb9364..67d53ad39ed 100644 --- a/bin/tests/system/rrchecker/tests.sh +++ b/bin/tests/system/rrchecker/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/rrl/tests.sh b/bin/tests/system/rrl/tests.sh index 85636aacf00..4263f298f59 100644 --- a/bin/tests/system/rrl/tests.sh +++ b/bin/tests/system/rrl/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + # test response rate limiting . ../conf.sh diff --git a/bin/tests/system/rrsetorder/tests.sh b/bin/tests/system/rrsetorder/tests.sh index 524efd984f7..ddd98629edd 100644 --- a/bin/tests/system/rrsetorder/tests.sh +++ b/bin/tests/system/rrsetorder/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="+nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short +nocookie" diff --git a/bin/tests/system/rsabigexponent/tests.sh b/bin/tests/system/rsabigexponent/tests.sh index ca7308a1ce2..1dedd496f5b 100644 --- a/bin/tests/system/rsabigexponent/tests.sh +++ b/bin/tests/system/rsabigexponent/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/runtime/tests.sh b/bin/tests/system/runtime/tests.sh index 0920b56342b..99650619b1f 100644 --- a/bin/tests/system/runtime/tests.sh +++ b/bin/tests/system/runtime/tests.sh @@ -11,11 +11,11 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + # shellcheck source=conf.sh . ../conf.sh -set -e - RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s" NAMED_DEFAULT_ARGS="-m record -d 99 -g -U 4" diff --git a/bin/tests/system/serve-stale/tests.sh b/bin/tests/system/serve-stale/tests.sh index 47a63117ee3..5a70bee1ef2 100755 --- a/bin/tests/system/serve-stale/tests.sh +++ b/bin/tests/system/serve-stale/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s" diff --git a/bin/tests/system/sfcache/tests.sh b/bin/tests/system/sfcache/tests.sh index 7f57aa8214d..d2aeee701f1 100644 --- a/bin/tests/system/sfcache/tests.sh +++ b/bin/tests/system/sfcache/tests.sh @@ -11,11 +11,11 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + # shellcheck source=conf.sh . ../conf.sh -set -e - status=0 n=0 diff --git a/bin/tests/system/smartsign/tests.sh b/bin/tests/system/smartsign/tests.sh index 9f953d09ca5..1da21bf887f 100644 --- a/bin/tests/system/smartsign/tests.sh +++ b/bin/tests/system/smartsign/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/sortlist/tests.sh b/bin/tests/system/sortlist/tests.sh index f55cf0abb0c..894b022a5b7 100644 --- a/bin/tests/system/sortlist/tests.sh +++ b/bin/tests/system/sortlist/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="+tcp +noadd +nosea +nostat +noquest +noauth +nocomm +nocmd -p ${PORT}" diff --git a/bin/tests/system/spf/tests.sh b/bin/tests/system/spf/tests.sh index 54b3519998a..f60eb0430ae 100644 --- a/bin/tests/system/spf/tests.sh +++ b/bin/tests/system/spf/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh n=1 diff --git a/bin/tests/system/staticstub/tests.sh b/bin/tests/system/staticstub/tests.sh index f8096d3a97b..c2ce332f5ba 100755 --- a/bin/tests/system/staticstub/tests.sh +++ b/bin/tests/system/staticstub/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="-p ${PORT}" diff --git a/bin/tests/system/statistics/tests.sh b/bin/tests/system/statistics/tests.sh index 0fc1b6b71d9..e39d0b60abe 100644 --- a/bin/tests/system/statistics/tests.sh +++ b/bin/tests/system/statistics/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGCMD="$DIG +tcp -p ${PORT}" diff --git a/bin/tests/system/statschannel/tests.sh b/bin/tests/system/statschannel/tests.sh index 219f72995fc..aba4a6976b7 100644 --- a/bin/tests/system/statschannel/tests.sh +++ b/bin/tests/system/statschannel/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + # shellcheck source=conf.sh . ../conf.sh diff --git a/bin/tests/system/stress/tests.sh b/bin/tests/system/stress/tests.sh index 43e373e09ff..8b5a9627e36 100644 --- a/bin/tests/system/stress/tests.sh +++ b/bin/tests/system/stress/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/stub/tests.sh b/bin/tests/system/stub/tests.sh index 78c014ba3e1..9a9ca664986 100644 --- a/bin/tests/system/stub/tests.sh +++ b/bin/tests/system/stub/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="+tcp -p ${PORT}" diff --git a/bin/tests/system/synthfromdnssec/tests.sh b/bin/tests/system/synthfromdnssec/tests.sh index 121e8ad4c91..1bfd00bda59 100644 --- a/bin/tests/system/synthfromdnssec/tests.sh +++ b/bin/tests/system/synthfromdnssec/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +# set -e +# # shellcheck source=conf.sh . ../conf.sh diff --git a/bin/tests/system/transport-acl/tests.sh b/bin/tests/system/transport-acl/tests.sh index 24a30c91680..9bed02b6f14 100644 --- a/bin/tests/system/transport-acl/tests.sh +++ b/bin/tests/system/transport-acl/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + # shellcheck disable=SC1091 . ../conf.sh diff --git a/bin/tests/system/tsig/tests.sh b/bin/tests/system/tsig/tests.sh index 97912837788..68c5b6dc2a9 100644 --- a/bin/tests/system/tsig/tests.sh +++ b/bin/tests/system/tsig/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="+tcp +nosea +nostat +noquest +nocomm +nocmd -p ${PORT}" diff --git a/bin/tests/system/tsiggss/tests.sh b/bin/tests/system/tsiggss/tests.sh index 41995e1e921..9707e01a2a7 100644 --- a/bin/tests/system/tsiggss/tests.sh +++ b/bin/tests/system/tsiggss/tests.sh @@ -13,6 +13,8 @@ # tests for TSIG-GSS updates +set -e + . ../conf.sh # Uncomment to regenerate credential caches after running krb5/setup.sh diff --git a/bin/tests/system/unknown/tests.sh b/bin/tests/system/unknown/tests.sh index 421fac66efb..2b0be2fb7e0 100644 --- a/bin/tests/system/unknown/tests.sh +++ b/bin/tests/system/unknown/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/upforwd/tests.sh b/bin/tests/system/upforwd/tests.sh index 7c0e01796c7..97ea1f5f7b7 100644 --- a/bin/tests/system/upforwd/tests.sh +++ b/bin/tests/system/upforwd/tests.sh @@ -15,6 +15,8 @@ # ns2 = secondary with update forwarding disabled; not currently used # ns3 = secondary with update forwarding enabled +set -e + . ../conf.sh DIGOPTS="+tcp +noadd +nosea +nostat +noquest +nocomm +nocmd -p ${PORT}" diff --git a/bin/tests/system/verify/tests.sh b/bin/tests/system/verify/tests.sh index 7f53def1cf2..7effa471930 100644 --- a/bin/tests/system/verify/tests.sh +++ b/bin/tests/system/verify/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh failed () { cat verify.out.$n | sed 's/^/D:/'; diff --git a/bin/tests/system/wildcard/tests.sh b/bin/tests/system/wildcard/tests.sh index d2e0bac8c0d..16aa712a406 100644 --- a/bin/tests/system/wildcard/tests.sh +++ b/bin/tests/system/wildcard/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh status=0 diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh index 5891de70ba3..ed470013f2f 100755 --- a/bin/tests/system/xfer/tests.sh +++ b/bin/tests/system/xfer/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="+tcp +noadd +nosea +nostat +noquest +nocomm +nocmd -p ${PORT}" diff --git a/bin/tests/system/xferquota/tests.sh b/bin/tests/system/xferquota/tests.sh index e0869aff900..85b6aeb9c5e 100755 --- a/bin/tests/system/xferquota/tests.sh +++ b/bin/tests/system/xferquota/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="+tcp +noadd +nosea +nostat +noquest +nocomm +nocmd -p ${PORT}" diff --git a/bin/tests/system/zero/tests.sh b/bin/tests/system/zero/tests.sh index 035447b4c8d..f02d4fc4328 100644 --- a/bin/tests/system/zero/tests.sh +++ b/bin/tests/system/zero/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + #shellcheck source=conf.sh . ../conf.sh diff --git a/bin/tests/system/zonechecks/tests.sh b/bin/tests/system/zonechecks/tests.sh index 59b41ccbc12..909845dd9c2 100644 --- a/bin/tests/system/zonechecks/tests.sh +++ b/bin/tests/system/zonechecks/tests.sh @@ -11,6 +11,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + . ../conf.sh DIGOPTS="-p ${PORT}"