diff options
| author | Gabriel Caruso <carusogabriel34@gmail.com> | 2019-09-25 00:07:09 +0200 |
|---|---|---|
| committer | Gabriel Caruso <carusogabriel34@gmail.com> | 2019-09-25 00:07:09 +0200 |
| commit | 202158e2cdf78d02d646e0471f493503dd8d6eb4 (patch) | |
| tree | fafa67a6641ee67da2054325250173618e318a3c | |
| parent | 652c09ecf77b8d98dd0857507b36419ef019e56d (diff) | |
| parent | 3205ebefa3cb5dd0a1b8bbd0a407cecad025e8af (diff) | |
| download | php-git-202158e2cdf78d02d646e0471f493503dd8d6eb4.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Use nproc instead of hardcoded number
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | travis/compile.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 20c5e704ba..af2b7afb17 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/travis/compile.sh b/travis/compile.sh index 34b0c91fac..e4706e0f96 100755 --- a/travis/compile.sh +++ b/travis/compile.sh @@ -23,7 +23,7 @@ else MAKE_QUIET="" fi -MAKE_JOBS=${MAKE_JOBS:-2} +MAKE_JOBS=${MAKE_JOBS:-$(nproc)} ./buildconf --force ./configure \ |