Merge branch 'PHP-8.3'

* PHP-8.3:
  Increase run-tests.php timeout for asan
This commit is contained in:
Ilija Tovilo 2023-08-30 23:10:30 +02:00
commit 0d94b58d35
No known key found for this signature in database
GPG key ID: A4F5D403F118200A

View file

@ -1212,6 +1212,10 @@ function system_with_timeout(
} }
$timeout = $valgrind ? 300 : ($env['TEST_TIMEOUT'] ?? 60); $timeout = $valgrind ? 300 : ($env['TEST_TIMEOUT'] ?? 60);
/* ASAN can cause a ~2-3x slowdown. */
if (isset($env['SKIP_ASAN'])) {
$timeout *= 3;
}
while (true) { while (true) {
/* hide errors from interrupted syscalls */ /* hide errors from interrupted syscalls */