Merge branch 'PHP-8.1' into PHP-8.2

iluuu1994 · iluuu1994 · commit 936538d8d737 · 2023-08-30T23:10:10.000+02:00
* PHP-8.1:
  Increase run-tests.php timeout for asan
diff --git a/run-tests.php b/run-tests.php
@@ -1204,6 +1204,10 @@ function system_with_timeout(
     }
 
     $timeout = $valgrind ? 300 : ($env['TEST_TIMEOUT'] ?? 60);
+    /* ASAN can cause a ~2-3x slowdown. */
+    if (isset($env['SKIP_ASAN'])) {
+        $timeout *= 3;
+    }
 
     while (true) {
         /* hide errors from interrupted syscalls */

Original file line number	Diff line number	Diff line change
`@@ -1204,6 +1204,10 @@ function system_with_timeout(`
`1204`	`1204`	`}`
`1205`	`1205`
`1206`	`1206`	`$timeout = $valgrind ? 300 : ($env['TEST_TIMEOUT'] ?? 60);`
	`1207`	`+ /* ASAN can cause a ~2-3x slowdown. */`
	`1208`	`+ if (isset($env['SKIP_ASAN'])) {`
	`1209`	`+ $timeout *= 3;`
	`1210`	`+ }`
`1207`	`1211`
`1208`	`1212`	`while (true) {`
`1209`	`1213`	`/* hide errors from interrupted syscalls */`