Don't attempt to run tests unless start file is successful

remotes/origin/fix-delete-homeidr-on-userdelete
Robin McCorkell 9 years ago committed by Thomas Müller
parent 8467dbfa91
commit ad028c555d

@ -19,6 +19,12 @@ user=smb-test
password=!owncloud123
host=WIN-9GTFAS08C15
if ! (nc -c -w 1 ${host} 445 </dev/null >&/dev/null \
|| nc -w 1 ${host} 445 </dev/null >&/dev/null); then
echo "[ERROR] Server not reachable" >&2
exit 1
fi
cat > $thisFolder/config.smb.php <<DELIM
<?php

@ -193,8 +193,7 @@ EOF
echo "name: $name"
# execute start file
./$FILES_EXTERNAL_BACKEND_ENV_PATH/$startFile
if ./$FILES_EXTERNAL_BACKEND_ENV_PATH/$startFile; then
# getting backend to test from filename
# it's the part between the dots startSomething.TestToRun.sh
testToRun=`echo $startFile | cut -d '-' -f 2`
@ -210,6 +209,7 @@ EOF
"$PHPUNIT" --configuration phpunit-autotest-external.xml --log-junit "autotest-external-results-$1-$name.xml" "$FILES_EXTERNAL_BACKEND_PATH/$testToRun.php"
RESULT=$?
fi
fi
# calculate stop file
stopFile=`echo "$startFile" | sed 's/start/stop/'`
@ -224,8 +224,7 @@ EOF
#
# start test execution
#
if [ -z "$1" ]
then
if [ -z "$1" ]; then
# run all known database configs
for DBCONFIG in $DBCONFIGS; do
execute_tests $DBCONFIG "$2"

Loading…
Cancel
Save