Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
  Make unrepeatable tests retriable

Author: iluuu1994

run-tests.php

@@ -1807,7 +1807,6 @@ function run_test(string $php, $file, array $env): string
         $skipCache = new SkipCache($enableSkipCache, $cfg['keep']['skip']);
     }
 
-    $retriable = true;
     $retried = false;
 retry:
 
@@ -1851,7 +1850,6 @@ function run_test(string $php, $file, array $env): string
     $tested = $test->getName();
 
     if ($test->hasSection('FILE_EXTERNAL')) {
-        $retriable = false;
         if ($num_repeats > 1) {
             return skip_test($tested, $tested_file, $shortname, 'Test with FILE_EXTERNAL might not be repeatable');
         }
@@ -1880,7 +1878,6 @@ function run_test(string $php, $file, array $env): string
         }
         $php = $php_cgi . ' -C ';
         $uses_cgi = true;
-        $retriable = false;
         if ($num_repeats > 1) {
             return skip_test($tested, $tested_file, $shortname, 'CGI does not support --repeat');
         }
@@ -1898,15 +1895,13 @@ function run_test(string $php, $file, array $env): string
         } else {
             return skip_test($tested, $tested_file, $shortname, 'phpdbg not available');
         }
-        $retriable = false;
         if ($num_repeats > 1) {
             return skip_test($tested, $tested_file, $shortname, 'phpdbg does not support --repeat');
         }
     }
 
     foreach (['CLEAN', 'STDIN', 'CAPTURE_STDIO'] as $section) {
         if ($test->hasSection($section)) {
-            $retriable = false;
             if ($num_repeats > 1) {
                 return skip_test($tested, $tested_file, $shortname, "Test with $section might not be repeatable");
             }
@@ -2092,7 +2087,6 @@ function run_test(string $php, $file, array $env): string
         settings2array(preg_split("/[\n\r]+/", $ini), $ini_settings);
 
         if (isset($ini_settings['opcache.opt_debug_level'])) {
-            $retriable = false;
             if ($num_repeats > 1) {
                 return skip_test($tested, $tested_file, $shortname, 'opt_debug_level tests are not repeatable');
             }
@@ -2626,7 +2620,7 @@ function run_test(string $php, $file, array $env): string
 
         $wanted_re = null;
     }
-    if (!$passed && !$retried && $retriable && error_may_be_retried($test, $output)) {
+    if (!$passed && !$retried && error_may_be_retried($test, $output)) {
         $retried = true;
         goto retry;
     }