com php-src: Merge branch 'PHP-5.5' into PHP-5.6: .travis.yml
| From: | Ferenc Kovacs | Date: | Thu, 30 Oct 2014 17:14:37 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: .travis.yml | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82898@lists.php.net to get a copy of this message | ||
Commit: 067852ca615bd083e821a08dbc21c21e9d46306f
Author: Ferenc Kovacs <tyrael@php.net> Thu, 30 Oct 2014 18:14:37 +0100
Parents: b9d1dc329f9065be9e839ce7cb61b57da45a4f9a 551593707384364705cd954a52c6e4089805f0ef
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=067852ca615bd083e821a08dbc21c21e9d46306f
Log:
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
Changed paths:
MM .travis.yml
Diff:
diff --cc .travis.yml
index 2125e8d,31cdcd0..f0a6f25
--- 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