Use the result of clean.sh and setup.sh command directly

This commit is contained in:
Ondřej Surý 2020-05-11 17:43:12 +02:00
parent 1202fd912a
commit 0fe5753315

View file

@ -185,10 +185,8 @@ fi
# Clean up files left from any potential previous runs
if test -f "$systest/clean.sh"
then
( cd "${systest}" && $SHELL clean.sh "$@" )
ret=$?
if [ $ret -ne 0 ]; then
echowarn "I:$systest:clean.sh script failed with $ret"
if ! ( cd "${systest}" && $SHELL clean.sh "$@" ); then
echowarn "I:$systest:clean.sh script failed"
fi
fi
@ -196,10 +194,8 @@ fi
# Set up any dynamically generated test data
if test -f "$systest/setup.sh"
then
( cd "${systest}" && $SHELL setup.sh "$@" )
ret=$?
if [ $ret -ne 0 ]; then
echowarn "I:$systest:clean.sh script failed with $ret"
if ! ( cd "${systest}" && $SHELL setup.sh "$@" ); then
echowarn "I:$systest:clean.sh script failed"
fi
fi