Merge branch 'PHP-8.3'

iluuu1994 · iluuu1994 · commit 0d94b58d3562 · 2023-08-30T23:10:30.000+02:00
* PHP-8.3:
  Increase run-tests.php timeout for asan
diff --git a/run-tests.php b/run-tests.php
@@ -1212,6 +1212,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
`@@ -1212,6 +1212,10 @@ function system_with_timeout(`
`1212`	`1212`	`}`
`1213`	`1213`
`1214`	`1214`	`$timeout = $valgrind ? 300 : ($env['TEST_TIMEOUT'] ?? 60);`
	`1215`	`+ /* ASAN can cause a ~2-3x slowdown. */`
	`1216`	`+ if (isset($env['SKIP_ASAN'])) {`
	`1217`	`+ $timeout *= 3;`
	`1218`	`+ }`
`1215`	`1219`
`1216`	`1220`	`while (true) {`
`1217`	`1221`	`/* hide errors from interrupted syscalls */`