diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-12-01 10:14:32 +0100 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-12-01 10:14:32 +0100 |
| commit | d964832255b266c6e0c99efcebce3e0ae85fd080 (patch) | |
| tree | c1e1e33530634e3326df094e4b5b3399b38273e7 /.travis.yml | |
| parent | c370683903adf740b330755cfb01cc2da5df7cb0 (diff) | |
| parent | a3a0e49586b2bf37b7969f6f5722d9b2aa797356 (diff) | |
| download | php-git-d964832255b266c6e0c99efcebce3e0ae85fd080.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Revert "don't try to send in the test results until we restored qa.php.net" as qa.php.net is back.
Conflicts:
.travis.yml
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 f0a6f257d5..2125e8d3d6 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 -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 |