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.
esr2587758 · May 2, 2014 · cc2e89d · cc2e89d
2 parents a7437db + 192b353
commit cc2e89d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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