Merge branch 'PHP-7.4'

* PHP-7.4:
  Use nproc instead of hardcoded number
This commit is contained in:
Gabriel Caruso 2019-09-25 00:07:09 +02:00
commit 202158e2cd
No known key found for this signature in database
GPG key ID: 4B385A6EE6C9678D
2 changed files with 2 additions and 2 deletions

View file

@ -73,7 +73,7 @@ before_script:
# Run PHPs run-tests.php
script:
- ./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 opcache.jit_buffer_size=16M -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 opcache.jit_buffer_size=16M -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120 -j$(nproc)
- sapi/cli/php -d extension_dir=`pwd`/modules -r 'dl("zend_test");'
after_success:

View file

@ -23,7 +23,7 @@ else
MAKE_QUIET=""
fi
MAKE_JOBS=${MAKE_JOBS:-2}
MAKE_JOBS=${MAKE_JOBS:-$(nproc)}
./buildconf --force
./configure \