diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-22 14:15:12 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-22 14:15:12 +0100 |
| commit | 6f29949bcaef690a93d7ecfb5cde8fa08ce36db7 (patch) | |
| tree | c124c21f72d295a9c216ede1a08693c963e6e063 | |
| parent | f3b13c765641fa46bc0d598eece2e96288b18ca4 (diff) | |
| parent | 12f2525d4f718a536347e4715b092e36453848e4 (diff) | |
| download | nextcloud-server-6f29949bcaef690a93d7ecfb5cde8fa08ce36db7.tar.gz nextcloud-server-6f29949bcaef690a93d7ecfb5cde8fa08ce36db7.zip | |
Merge pull request #22527 from wern/master
Moved set -e option to enable executable checks again
| -rwxr-xr-x | autotest.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/autotest.sh b/autotest.sh index 61c21dc0ba2..d8d75817712 100755 --- a/autotest.sh +++ b/autotest.sh @@ -13,8 +13,6 @@ # @copyright 2012-2015 Thomas Müller thomas.mueller@tmit.eu # -set -e - #$EXECUTOR_NUMBER is set by Jenkins and allows us to run autotest in parallel DATABASENAME=oc_autotest$EXECUTOR_NUMBER DATABASEUSER=oc_autotest$EXECUTOR_NUMBER @@ -34,6 +32,8 @@ fi PHP=$(which "$PHP_EXE") PHPUNIT=$(which phpunit) +set -e + _XDEBUG_CONFIG=$XDEBUG_CONFIG unset XDEBUG_CONFIG |