script shall exit with error in case the start file has issues - fixes #20798

This commit is contained in:
Thomas Müller 2015-12-09 12:09:45 +01:00
parent ff656e31f1
commit e3b47e80f7

View file

@ -193,7 +193,8 @@ EOF
echo "name: $name" echo "name: $name"
# execute start file # execute start file
if ./$FILES_EXTERNAL_BACKEND_ENV_PATH/$startFile; then ./$FILES_EXTERNAL_BACKEND_ENV_PATH/$startFile
if [ $? -eq 0 ]; then
# getting backend to test from filename # getting backend to test from filename
# it's the part between the dots startSomething.TestToRun.sh # it's the part between the dots startSomething.TestToRun.sh
testToRun=`echo $startFile | cut -d '-' -f 2` testToRun=`echo $startFile | cut -d '-' -f 2`
@ -209,6 +210,8 @@ EOF
"$PHPUNIT" --configuration phpunit-autotest-external.xml --log-junit "autotest-external-results-$1-$name.xml" "$FILES_EXTERNAL_BACKEND_PATH/$testToRun.php" "$PHPUNIT" --configuration phpunit-autotest-external.xml --log-junit "autotest-external-results-$1-$name.xml" "$FILES_EXTERNAL_BACKEND_PATH/$testToRun.php"
RESULT=$? RESULT=$?
fi fi
else
DOEXIT=1
fi fi
# calculate stop file # calculate stop file
@ -218,6 +221,10 @@ EOF
# execute stop file if existant # execute stop file if existant
./$FILES_EXTERNAL_BACKEND_ENV_PATH/$stopFile ./$FILES_EXTERNAL_BACKEND_ENV_PATH/$stopFile
fi fi
if [ "$DOEXIT" ]; then
echo "Error during start file execution ... terminating"
exit $DOEXIT
fi
done; done;
} }