From 8b357a35d2478200f7cccd3f357aa8203bf81c0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Tue, 12 May 2020 10:01:35 +0200 Subject: [PATCH] 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. --- bin/tests/system/run.sh.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/tests/system/run.sh.in b/bin/tests/system/run.sh.in index 6217160357..069ccad0ab 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