From: Ondřej Surý <ondrej@isc.org>
Date: Tue, 12 May 2020 08:01:35 +0000 (+0200)
Subject: Fail immediatelly when clean.sh or setup.sh fails
X-Git-Tag: v9.17.2~81^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b357a35d2478200f7cccd3f357aa8203bf81c0d;p=thirdparty%2Fbind9.git

Fail immediatelly when clean.sh or setup.sh fails

The `statschannel/ns2/` was missing `manykeys.db.in`, but the test
succeeded even when `setup.sh` (or `clean.sh`) failed to execute.  This
commit makes run.sh to run in stricter mode and fail the test
immediately when `clean.sh` or `setup.sh` fails.
---

diff --git a/bin/tests/system/run.sh.in b/bin/tests/system/run.sh.in
index 62171603574..069ccad0ab1 100644
--- a/bin/tests/system/run.sh.in
+++ b/bin/tests/system/run.sh.in
@@ -187,6 +187,9 @@ if test -f "$systest/clean.sh"
 then
     if ! ( cd "${systest}" && $SHELL clean.sh "$@" ); then
 	echowarn "I:$systest:clean.sh script failed"
+	echofail "R:$systest:FAIL"
+	echoend  "E:$systest:$(date_with_args)"
+	exit 1
     fi
 
 fi
@@ -195,7 +198,10 @@ fi
 if test -f "$systest/setup.sh"
 then
     if ! ( cd "${systest}" && $SHELL setup.sh "$@" ); then
-	echowarn "I:$systest:clean.sh script failed"
+	echowarn "I:$systest:setup.sh script failed"
+	echofail "R:$systest:FAIL"
+	echoend  "E:$systest:$(date_with_args)"
+	exit 1
     fi
 fi