From: Ondřej Surý <ondrej@isc.org>
Date: Thu, 30 Apr 2020 12:53:55 +0000 (+0200)
Subject: Fail running run.sh when clean.sh or setup.sh fails
X-Git-Tag: v9.17.2~108^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=101672f6648d22762a32fa3d1f48fb081be7ba37;p=thirdparty%2Fbind9.git

Fail running run.sh when clean.sh or setup.sh fails
---

diff --git a/bin/tests/system/run.sh.in b/bin/tests/system/run.sh.in
index 4e8f5cc6b90..2f46310ade7 100644
--- a/bin/tests/system/run.sh.in
+++ b/bin/tests/system/run.sh.in
@@ -185,16 +185,24 @@ fi
 # Clean up files left from any potential previous runs
 if test -f "$systest/clean.sh"
 then
-   ( cd "${systest}" && $SHELL clean.sh "$@" )
+    ( cd "${systest}" && $SHELL clean.sh "$@" )
+    ret=$?
+    if [ $ret -ne 0 ]; then
+	echowarn "I:$systest:clean.sh script failed with $ret"
+    fi
+
 fi
 
 # Set up any dynamically generated test data
 if test -f "$systest/setup.sh"
 then
-   ( cd "${systest}" && $SHELL setup.sh "$@" )
+    ( cd "${systest}" && $SHELL setup.sh "$@" )
+    ret=$?
+    if [ $ret -ne 0 ]; then
+	echowarn "I:$systest:clean.sh script failed with $ret"
+    fi
 fi
 
-
 status=0
 run=0
 # Run the tests