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
aboks · Oct 30, 2014 · 067852c · 067852c
2 parents b9d1dc3 + 5515937
commit 067852c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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