From: Ondřej Surý Date: Thu, 6 Dec 2018 10:09:25 +0000 (+0100) Subject: Run the sfcache system tests with `set -e` enabled X-Git-Tag: v9.13.6~109^2 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=e1bf5624fb101c6541ca36de01f1cae9219af314;p=thirdparty%2Fbind9.git Run the sfcache system tests with `set -e` enabled --- diff --git a/bin/tests/system/sfcache/clean.sh b/bin/tests/system/sfcache/clean.sh index 0881d42c581..51939e98b04 100644 --- a/bin/tests/system/sfcache/clean.sh +++ b/bin/tests/system/sfcache/clean.sh @@ -9,6 +9,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +set -e + rm -f ./*/K*.key ./*/K*.private ./*/*.signed ./*/*.db ./*/dsset-* rm -f ./*/managed.conf ./*/trusted.conf rm -f ./*/named.memstats diff --git a/bin/tests/system/sfcache/ns1/sign.sh b/bin/tests/system/sfcache/ns1/sign.sh index 59653ed0632..f448ecca867 100644 --- a/bin/tests/system/sfcache/ns1/sign.sh +++ b/bin/tests/system/sfcache/ns1/sign.sh @@ -12,6 +12,8 @@ # shellcheck source=conf.sh . "$SYSTEMTESTTOP/conf.sh" +set -e + zone=. infile=root.db.in zonefile=root.db diff --git a/bin/tests/system/sfcache/ns2/sign.sh b/bin/tests/system/sfcache/ns2/sign.sh index 9ef7aaae2cc..11f866abb27 100644 --- a/bin/tests/system/sfcache/ns2/sign.sh +++ b/bin/tests/system/sfcache/ns2/sign.sh @@ -12,6 +12,8 @@ # shellcheck source=conf.sh . "$SYSTEMTESTTOP/conf.sh" +set -e + zone=example. infile=example.db.in zonefile=example.db diff --git a/bin/tests/system/sfcache/ns5/sign.sh b/bin/tests/system/sfcache/ns5/sign.sh index 04749e78be8..9dcd9fe732a 100644 --- a/bin/tests/system/sfcache/ns5/sign.sh +++ b/bin/tests/system/sfcache/ns5/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 ".") keyfile_to_trusted_keys "$keyname" > trusted.conf diff --git a/bin/tests/system/sfcache/setup.sh b/bin/tests/system/sfcache/setup.sh index b5adf28f36e..14235a466c4 100644 --- a/bin/tests/system/sfcache/setup.sh +++ b/bin/tests/system/sfcache/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 diff --git a/bin/tests/system/sfcache/tests.sh b/bin/tests/system/sfcache/tests.sh index e20639c8b01..43922e4e836 100644 --- a/bin/tests/system/sfcache/tests.sh +++ b/bin/tests/system/sfcache/tests.sh @@ -12,6 +12,8 @@ # shellcheck source=conf.sh . "$SYSTEMTESTTOP/conf.sh" +set -e + status=0 n=0