From: Felipe Pena <felipe@php.net>
Date: Sat, 26 Nov 2011 17:56:43 +0000 (+0000)
Subject: - Fixed bug #55788 (test redirects should abide SHOW_ONLY_GROUPS in run-tests.php)
X-Git-Tag: php-5.5.0alpha1~804
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=adf6003bddbf675b841b719420b5b71466cf4c57;p=php

- 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 44b6422295..79ac9490c9 100755
--- 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)