archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-21 01:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-5.5' into PHP-5.6

Browse source 
* 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
This commit is contained in:
Ferenc Kovacs 2014-10-30 18:14:37 +01:00
commit 067852ca61
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -42,5 +42,5 @@ before_script:
# Run PHPs run-tests.php # Run PHPs run-tests.php
script: 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 - ./sapi/cli/php sapi/phpdbg/tests/run-tests.php -diff2stdout --phpdbg sapi/phpdbg/phpdbg