]> granicus.if.org Git - php/commitdiff
Fix NO_INTERACTION handling in parallel test runner
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 31 May 2019 12:03:22 +0000 (14:03 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 31 May 2019 12:03:22 +0000 (14:03 +0200)
This printing shouldn't depend on NO_INTERACTION, the variable that
controls this is SHOW_ONLY_GROUPS.

run-tests.php

index b8dbb9cc474ca8b3098d2f156cbbdf67480d1819..b44065bce7e0fa4bb1bb966b4c5836049b7158dd 100755 (executable)
@@ -1350,7 +1350,7 @@ function run_all_tests($test_files, $env, $redir_tested = null)
 
 /** The heart of parallel testing. */
 function run_all_tests_parallel($test_files, $env, $redir_tested) {
-       global $workers, $test_idx, $test_cnt, $test_results, $failed_tests_file, $result_tests_file, $PHP_FAILED_TESTS, $shuffle;
+       global $workers, $test_idx, $test_cnt, $test_results, $failed_tests_file, $result_tests_file, $PHP_FAILED_TESTS, $shuffle, $SHOW_ONLY_GROUPS;
 
        // The PHP binary running run-tests.php, and run-tests.php itself
        // This PHP executable is *not* necessarily the same as the tested version
@@ -1593,9 +1593,9 @@ escape:
                                                        }
                                                        $test_idx++;
 
-                                                       if (!isset($env['NO_INTERACTION']) || !$env['NO_INTERACTION']) {
-                                                               clear_show_test();
-                                                               echo $resultText;
+                                                       clear_show_test();
+                                                       echo $resultText;
+                                                       if (!$SHOW_ONLY_GROUPS) {
                                                                show_test($test_idx, count($workerProcs) . "/$workers concurrent test workers running");
                                                        }