From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 29 Apr 2020 13:16:36 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e0c608ce0f0860ee09c2ea2f66ab9447c6773db;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Reduce test parallelism on ARM64 CI
---

0e0c608ce0f0860ee09c2ea2f66ab9447c6773db
diff --cc .travis.yml
index 7318269344,1b3ce4119a..70e19ec7a7
--- a/.travis.yml
+++ b/.travis.yml
@@@ -91,7 -89,9 +91,9 @@@ 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 -j$(nproc)
+     # ARM64 CI reports nproc=32, which is excessive.
+     - if [ -z "$ARM64" ]; then export JOBS=$(nproc); else export JOBS=16; fi
 -    - ./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 -j$JOBS
++    - ./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$JOBS
      - sapi/cli/php -d extension_dir=`pwd`/modules -r 'dl("zend_test");'
  
  after_success: