com php-src: Fix NO_INTERACTION handling in parallel test runner: run-tests.php
| From: | Nikita Popov | Date: | Fri, 31 May 2019 12:03:22 +0000 |
| Subject: | com php-src: Fix NO_INTERACTION handling in parallel test runner: run-tests.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-106489@lists.php.net to get a copy of this message | ||
Commit: 4ef7f70987410dde626201416849be71b555e18e
Author: Nikita Popov <nikita.ppv@gmail.com> Fri, 31 May 2019 14:03:22 +0200
Parents: 67b84e45489e944e144429a26f3294161c1c7e0a
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4ef7f70987410dde626201416849be71b555e18e
Log:
Fix NO_INTERACTION handling in parallel test runner
This printing shouldn't depend on NO_INTERACTION, the variable that
controls this is SHOW_ONLY_GROUPS.
Changed paths:
M run-tests.php
Diff:
diff --git a/run-tests.php b/run-tests.php
index b8dbb9c..b44065b 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -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");
}