Skip to content

Commit 05c2e87

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
2 parents 7435ab3 + b2f49c6 commit 05c2e87

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ before_script:
7474

7575
# Run PHPs run-tests.php
7676
script:
77-
- ./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
77+
- ./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
78+
- sapi/cli/php -d extension_dir=`pwd`/modules -r 'dl("zend_test");'
7879

7980
after_success:
8081
- ccache --show-stats

travis/compile.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ $TS \
7373
--with-enchant=/usr \
7474
--with-kerberos \
7575
--enable-sysvmsg \
76-
--enable-zend-test \
76+
--enable-zend-test=shared \
7777
> "$CONFIG_LOG_FILE"
7878

7979
make "-j${MAKE_JOBS}" $MAKE_QUIET > "$MAKE_LOG_FILE"

0 commit comments

Comments
 (0)