]> granicus.if.org Git - php/commitdiff
have parallel test runner respect NO_INTERACTION
authorJoe Watkins <krakjoe@php.net>
Thu, 30 May 2019 05:46:31 +0000 (07:46 +0200)
committerJoe Watkins <krakjoe@php.net>
Thu, 30 May 2019 05:46:31 +0000 (07:46 +0200)
run-tests.php

index f6f18354c09fb748cd508625b904646c7d70c494..e776335fdd29894b1814690eac8180f431cca24c 100755 (executable)
@@ -474,6 +474,7 @@ NO_PROC_OPEN_ERROR;
                                                break;
                                        case 'q':
                                                putenv('NO_INTERACTION=1');
+                                               $environment['NO_INTERACTION'] = 1;
                                                break;
                                        //case 'r'
                                        case 's':
@@ -1588,9 +1589,12 @@ escape:
                                                                $PHP_FAILED_TESTS[$category] = array_merge($PHP_FAILED_TESTS[$category], $tests);
                                                        }
                                                        $test_idx++;
-                                                       clear_show_test();
-                                                       echo $resultText;
-                                                       show_test($test_idx, count($workerProcs) . "/$workers concurrent test workers running");
+
+                                                       if (!isset($env['NO_INTERACTION']) || !$env['NO_INTERACTION']) {
+                                                               clear_show_test();
+                                                               echo $resultText;
+                                                               show_test($test_idx, count($workerProcs) . "/$workers concurrent test workers running");
+                                                       }
 
                                                        if (!is_array($name) && $result != 'REDIR') {
                                                                $test_results[$index] = $result;