diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-05-02 09:50:25 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-05-02 09:50:25 +0200 |
| commit | cc2e89d4e157709ceb062ac316274da729289952 (patch) | |
| tree | f043ab853ab10321cb9c3a9d749300b183e2e537 | |
| parent | a7437db7769c7c7d1a235734c3f0ad51df8d971f (diff) | |
| parent | 192b35382a7a3c7bc1fa1ab56efc5199e14da637 (diff) | |
| download | php-git-cc2e89d4e157709ceb062ac316274da729289952.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Revert "show leaks in their own group" using valgrind would be a bit too much for travis I guess.
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index d85decad3d..87a8695673 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,4 +33,4 @@ 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" -m --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 |