com php-src: Merge branch 'PHP-5.5' into PHP-5.6: .travis.yml
| From: | Ferenc Kovacs | Date: | Mon, 01 Dec 2014 09:14:32 +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-83456@lists.php.net to get a copy of this message | ||
Commit: d964832255b266c6e0c99efcebce3e0ae85fd080
Author: Ferenc Kovacs <tyrael@php.net> Mon, 1 Dec 2014 10:14:32 +0100
Parents: c370683903adf740b330755cfb01cc2da5df7cb0 a3a0e49586b2bf37b7969f6f5722d9b2aa797356
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d964832255b266c6e0c99efcebce3e0ae85fd080
Log:
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
Changed paths:
MM .travis.yml
Diff:
diff --cc .travis.yml
index f0a6f25,b2ed607..2125e8d
--- 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
+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