]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikita.ppv@gmail.com>
Sat, 3 Jun 2017 10:39:50 +0000 (12:39 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Sat, 3 Jun 2017 10:39:50 +0000 (12:39 +0200)
1  2 
.travis.yml

diff --cc .travis.yml
index c5db1fdd1b9f6d62427d822b2c851a8bde5c1d4b,7024013fa3f0f90a393065111d22e79988366e20..2ea2baf70c2294fc3381733fbf7c79471ed15e2e
@@@ -60,7 -57,4 +60,7 @@@ before_script
  
  # Run PHPs run-tests.php 
  script:
-     - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 1 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120
 -    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --set-timeout 120
++    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120
 +
 +after_success:
 +    - ccache --show-stats