wip

Author: mvorisek

run-tests.php

@@ -160,7 +160,7 @@ function main(): void
            $optionals, $pass_option_n, $pass_options,
            $pattern_match, $php, $php_cgi, $phpdbg, $preload, $redir_tests,
            $repeat, $result_tests_file, $slow_min_ms, $start_time, $switch,
-           $temp_source, $temp_target, $test_cnt, $test_dirs,
+           $limit_skipped_exts, $temp_source, $temp_target, $test_cnt, $test_dirs,
            $test_files, $test_idx, $test_list, $test_results, $testfile,
            $user_tests, $valgrind, $sum_results, $shuffle, $file_cache, $num_repeats,
            $bless, $show_progress;
@@ -656,14 +656,6 @@ function main(): void
         }
     }
 
-    if ($limit_skipped_exts !== false) {
-        $exts_skipped_diff = array_diff($exts_skipped, $limit_skipped_exts);
-        if (count($exts_skipped_diff) > 0) {
-            echo 'The following extensions are not allowed to be skipped: ' . implode(', ', $exts_skipped_diff) . "\n";
-            exit(1);
-        }
-    }
-
     if ($selected_tests && count($test_files) === 0) {
         echo "No tests found.\n";
         return;
@@ -1273,11 +1265,20 @@ function system_with_timeout(
  */
 function run_all_tests(array $test_files, array $env, $redir_tested = null): void
 {
-    global $test_results, $failed_tests_file, $result_tests_file, $php, $test_idx, $file_cache;
+    global $test_results, $failed_tests_file, $result_tests_file, $php, $test_idx, $file_cache,
+        $exts_skipped, $limit_skipped_exts;
     global $preload;
     // Parallel testing
     global $PHP_FAILED_TESTS, $workers, $workerID, $workerSock;
 
+    if ($limit_skipped_exts !== false) {
+        $exts_skipped_diff = array_diff($exts_skipped, $limit_skipped_exts);
+        if (count($exts_skipped_diff) > 0) {
+            echo 'The following extensions are not allowed to be skipped: ' . implode(', ', $exts_skipped_diff) . "\n";
+            exit(1);
+        }
+    }
+
     if ($file_cache !== null || $preload) {
         /* Automatically skip opcache tests in --file-cache and --preload mode,
          * because opcache generally expects these to run under a default configuration. */