diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-10-30 18:14:37 +0100 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-10-30 18:14:37 +0100 |
| commit | 067852ca615bd083e821a08dbc21c21e9d46306f (patch) | |
| tree | 4bae67b6cb1c98aeaaafda22a6f4c2a583ea7af7 | |
| parent | b9d1dc329f9065be9e839ce7cb61b57da45a4f9a (diff) | |
| parent | 551593707384364705cd954a52c6e4089805f0ef (diff) | |
| download | php-git-067852ca615bd083e821a08dbc21c21e9d46306f.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
don't try to send in the test results until we restored qa.php.net
Don't treat warnings as failures in the junit output
Conflicts:
.travis.yml
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 2125e8d3d6..f0a6f257d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,5 +42,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 + - ./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 sapi/phpdbg/tests/run-tests.php -diff2stdout --phpdbg sapi/phpdbg/phpdbg |