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

(cherry picked from commit 101672f6648d22762a32fa3d1f48fb081be7ba37)

diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index a9e2f2652f40e10ec18fd7b03203ff563159e523..921945c61c7f39159717061f1be75cbe21371868 100755 (executable)
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -190,13 +190,21 @@ 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