diff options
| author | Timm Friebe <thekid@thekid.de> | 2014-09-25 19:45:05 +0200 |
|---|---|---|
| committer | Timm Friebe <thekid@thekid.de> | 2014-09-25 19:45:05 +0200 |
| commit | e83580c1f00a60d4ad926e849052028211480af9 (patch) | |
| tree | 1fef3277df2d71756e49fbf81ccb026a62c41911 /run-tests.php | |
| parent | 3db67313c9207ca12a512a08d1bdd54347f821c8 (diff) | |
| parent | eabad90acbdac82a5b3f78d71477727354f9e64d (diff) | |
| download | php-git-e83580c1f00a60d4ad926e849052028211480af9.tar.gz | |
Merge branch 'master' into catchable-fatals/methods-on-non-objects
Diffstat (limited to 'run-tests.php')
| -rwxr-xr-x | run-tests.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/run-tests.php b/run-tests.php index e6a7e1b806..4f29345d9f 100755 --- a/run-tests.php +++ b/run-tests.php @@ -2,7 +2,7 @@ <?php /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2010 The PHP Group | +----------------------------------------------------------------------+ @@ -1192,6 +1192,7 @@ function run_test($php, $file, $env) global $no_clean; global $valgrind_version; global $JUNIT; + global $SHOW_ONLY_GROUPS; $temp_filenames = null; $org_file = $file; @@ -1366,7 +1367,9 @@ TEST $file } } - show_test($test_idx, $shortname); + if (!$SHOW_ONLY_GROUPS) { + show_test($test_idx, $shortname); + } if (is_array($IN_REDIRECT)) { $temp_dir = $test_dir = $IN_REDIRECT['dir']; @@ -2572,7 +2575,7 @@ function show_result($result, $tested, $tested_file, $extra = '', $temp_filename if (!$SHOW_ONLY_GROUPS || in_array($result, $SHOW_ONLY_GROUPS)) { echo "$result $tested [$tested_file] $extra\n"; - } else { + } else if (!$SHOW_ONLY_GROUPS) { // Write over the last line to avoid random trailing chars on next echo echo str_repeat(" ", $line_length), "\r"; } |