Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  Fix travis_wait
This commit is contained in:
Ilija Tovilo 2023-11-29 10:35:34 +01:00
commit 2751aa3894
No known key found for this signature in database
GPG key ID: A4F5D403F118200A
2 changed files with 2 additions and 2 deletions

View file

@ -85,7 +85,7 @@ before_script:
# Run PHPs run-tests.php
script:
- travis_wait 60 ./travis/test.sh -d opcache.jit_buffer_size=16M -d opcache.jit=tracing
- ./travis/test.sh -d opcache.jit_buffer_size=16M -d opcache.jit=tracing
- sapi/cli/php -d extension_dir=`pwd`/modules -r 'dl("zend_test");'
after_success:

View file

@ -7,7 +7,7 @@ if [ -z "$ARM64" ]; then export JOBS=$(nproc); else export JOBS=16; fi
export SKIP_SLOW_TESTS=1
export SKIP_IO_CAPTURE_TESTS=1
./sapi/cli/php run-tests.php -P \
-g "FAIL,BORK,LEAK" --offline --show-diff --show-slow 1000 \
-g "FAIL,SKIP,BORK,LEAK" --offline --show-diff --show-slow 1000 \
--no-progress \
--set-timeout 120 -j$JOBS \
-d extension=`pwd`/modules/zend_test.so \