aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-02-05 17:51:33 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2014-02-05 17:51:33 +0100
commite2a28e5d1d1e7956ab37884da7439ef56836655c (patch)
tree8c30b2992ad83c266d48e735ecd65ecfee671e73
parent61aa6ead83f7956a99a9feb635961694a036dff0 (diff)
parent20935f4e2496b23c07d76d5ce2daf85bb60f0cce (diff)
downloadnextcloud-server-e2a28e5d1d1e7956ab37884da7439ef56836655c.tar.gz
nextcloud-server-e2a28e5d1d1e7956ab37884da7439ef56836655c.zip
Merge pull request #7091 from owncloud/jenkins-catchsetuperrors
Catch setup errors during autotest
-rwxr-xr-xautotest.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/autotest.sh b/autotest.sh
index 94fc692a94d..b88e9cf68b4 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -185,19 +185,23 @@ EOF
cp $BASEDIR/tests/autoconfig-$1.php $BASEDIR/config/autoconfig.php
# trigger installation
- php -f index.php
+ echo "INDEX"
+ php -f index.php | grep -i -C9999 error && echo "Error during setup" && exit 101
+ echo "END INDEX"
#test execution
echo "Testing with $1 ..."
cd tests
rm -rf coverage-html-$1
mkdir coverage-html-$1
- php -f enable_all.php
+ php -f enable_all.php | grep -i -C9999 error && echo "Error during setup" && exit 101
if [ -z "$NOCOVERAGE" ]; then
$PHPUNIT --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml --coverage-clover autotest-clover-$1.xml --coverage-html coverage-html-$1 $2 $3
+ RESULT=$?
else
echo "No coverage"
$PHPUNIT --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml $2 $3
+ RESULT=$?
fi
}