From: Ferenc Kovacs <tyrael@php.net>
Date: Thu, 30 Oct 2014 17:14:37 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHP7_REMOVALS~87^2~23^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=067852ca615bd083e821a08dbc21c21e9d46306f;p=php

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
---

067852ca615bd083e821a08dbc21c21e9d46306f
diff --cc .travis.yml
index 2125e8d3d6,31cdcd07f5..f0a6f257d5
--- a/.travis.yml
+++ b/.travis.yml
@@@ -41,6 -39,4 +41,6 @@@ before_script
      - . ./travis/ext/pdo_pgsql/setup.sh
  
  # 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
 +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