- Fixed bug #55788 (test redirects should abide SHOW_ONLY_GROUPS in run-tests.php)

  patch by: tyrael at php.net

diff --git a/run-tests.php b/run-tests.php
index 2340fa96fd8647525858c82216c5e12e6b6d5228..e9c6fcb8fda5ea4aa8c5aa9cee72a839c5465318 100755 (executable)
--- a/run-tests.php
+++ b/run-tests.php
@@ -678,7 +678,7 @@ Options:
                 with value 'bar').
 
     -g          Comma seperated list of groups to show during test run
-                (e.x. FAIL,SKIP).
+                (possible values: PASS, FAIL, XFAIL, SKIP, BORK, WARN, LEAK, REDIRECT).
 
     -m          Test for memory leaks with Valgrind.
 
@@ -2384,24 +2384,34 @@ function show_summary()
 
 function show_redirect_start($tests, $tested, $tested_file)
 {
-       global $html_output, $html_file;
+       global $html_output, $html_file, $line_length, $SHOW_ONLY_GROUPS;
 
        if ($html_output) {
                fwrite($html_file, "<tr><td colspan='3'>---&gt; $tests ($tested [$tested_file]) begin</td></tr>\n");
        }
 
-       echo "---> $tests ($tested [$tested_file]) begin\n";
+       if (!$SHOW_ONLY_GROUPS || in_array('REDIRECT', $SHOW_ONLY_GROUPS)) {
+                  echo "REDIRECT $tests ($tested [$tested_file]) begin\n";
+       } else {
+                  // Write over the last line to avoid random trailing chars on next echo
+                  echo str_repeat(" ", $line_length), "\r";
+       }
 }
 
 function show_redirect_ends($tests, $tested, $tested_file)
 {
-       global $html_output, $html_file;
+       global $html_output, $html_file, $line_length, $SHOW_ONLY_GROUPS;
 
        if ($html_output) {
                fwrite($html_file, "<tr><td colspan='3'>---&gt; $tests ($tested [$tested_file]) done</td></tr>\n");
        }
 
-       echo "---> $tests ($tested [$tested_file]) done\n";
+       if (!$SHOW_ONLY_GROUPS || in_array('REDIRECT', $SHOW_ONLY_GROUPS)) {
+                  echo "REDIRECT $tests ($tested [$tested_file]) done\n";
+       } else {
+                  // Write over the last line to avoid random trailing chars on next echo
+                  echo str_repeat(" ", $line_length), "\r";
+       }
 }
 
 function show_test($test_idx, $shortname)