diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-12-01 10:15:42 +0100 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-12-01 10:15:42 +0100 |
| commit | d04685732ec315d1b4e2df1883bdfef7ed2c1dbe (patch) | |
| tree | cecb71bb18780c0d5c4c9987cf71010400c4ce96 /.travis.yml | |
| parent | 49de5b7aed4bed9ebbb4bc085d240084b090ad7b (diff) | |
| parent | d964832255b266c6e0c99efcebce3e0ae85fd080 (diff) | |
| download | php-git-d04685732ec315d1b4e2df1883bdfef7ed2c1dbe.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Revert "don't try to send in the test results until we restored qa.php.net" as qa.php.net is back.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 655507b83b..d9e11a07d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,5 +46,5 @@ before_script: # Run PHPs run-tests.php script: - - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff --set-timeout 120 -s + - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff --set-timeout 120 - ./sapi/cli/php sapi/phpdbg/tests/run-tests.php -diff2stdout --phpdbg sapi/phpdbg/phpdbg |