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 4e8f5cc6b90f526507da832550cbcac387fa4777..2f46310ade7b37c6291b2c1036426449d920a0f0 100644 (file)
--- 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