diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2019-04-18 12:59:05 +0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-04-18 12:59:05 +0200 |
commit | 05c2e87e84f2e3f3aa67f4ad3fb4d5c1d4f0071e (patch) | |
tree | 67654ec6ee138758c4fab4ceb895c4ba7fb01377 | |
parent | 7435ab3375ad1ef313e13ac3b0658c948f2f4dac (diff) | |
parent | b2f49c69b146603d6c34fb5ca67ebadd745ec623 (diff) | |
download | php-git-05c2e87e84f2e3f3aa67f4ad3fb4d5c1d4f0071e.tar.gz |
Merge branch 'PHP-7.3' into PHP-7.4
-rw-r--r-- | .travis.yml | 3 | ||||
-rwxr-xr-x | travis/compile.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 1942e8d9a3..ba6a6ba3d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/travis/compile.sh b/travis/compile.sh index 987338014e..65c11ff378 100755 --- a/travis/compile.sh +++ b/travis/compile.sh @@ -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" |