Modernization of run-tests.php

Author: dragoonis

run-tests.php

@@ -443,15 +443,7 @@ function main()
 
             switch ($switch) {
                 case 'j':
-                    $workers = substr($argv[$i], 2);
-                    if (!preg_match('/^\d+$/', $workers) || $workers == 0) {
-                        error("'$workers' is not a valid number of workers, try e.g. -j16 for 16 workers");
-                    }
-                    $workers = intval($workers, 10);
-                    // Don't use parallel testing infrastructure if there is only one worker.
-                    if ($workers === 1) {
-                        $workers = null;
-                    }
+                    $workers = getNumberOfWorkers($argv[$i]);
                     break;
                 case 'r':
                 case 'l':
@@ -3612,4 +3604,28 @@ function check_proc_open_function_exists()
     }
 }
 
+
+
+
+function getNumberOfWorkers($workers): int
+{
+    $cleanWorkers = substr($workers, 2);
+    if (!preg_match('/^\d+$/', $cleanWorkers) || $cleanWorkers == 0) {
+        error("'$workers' is not a valid number of workers, try e.g. -j16 for 16 workers");
+    }
+    $cleanWorkers = intval($cleanWorkers, 10);
+    // Don't use parallel testing infrastructure if there is only one worker.
+    if ($cleanWorkers === 1) {
+        $cleanWorkers = null;
+    }
+
+    return $cleanWorkers;
+}
+
+function getMaxWorkersFromTestFiles($workers, $testFiles)
+{
+    return max(1, min($workers, count($test_files)))
+}
+
+
 main();