Merge branch 'PHP-7.4'

This commit is contained in:
Nikita Popov 2019-04-18 12:59:12 +02:00
commit 2b7dd211a9
2 changed files with 3 additions and 2 deletions

View file

@ -74,7 +74,8 @@ before_script:
# Run PHPs run-tests.php
script:
- ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d opcache.protect_memory=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 -j2
- ./sapi/cli/php run-tests.php -P -d extension=`pwd`/modules/zend_test.so $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d opcache.protect_memory=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 -j2
- sapi/cli/php -d extension_dir=`pwd`/modules -r 'dl("zend_test");'
after_success:
- ccache --show-stats

View file

@ -73,7 +73,7 @@ $TS \
--with-enchant=/usr \
--with-kerberos \
--enable-sysvmsg \
--enable-zend-test \
--enable-zend-test=shared \
> "$CONFIG_LOG_FILE"
make "-j${MAKE_JOBS}" $MAKE_QUIET > "$MAKE_LOG_FILE"