From 44500d6d98eecb5190da35be0a88a4287c08f3d1 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 13 Sep 2007 12:22:08 +0000
Subject: r25124: Include link to summary page, hide environment variables for
 'none' environment. (This used to be commit
 9fac2bd884bc325792d65bcdd166d785269655df)

---
 source4/selftest/output/html.pm | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/source4/selftest/output/html.pm b/source4/selftest/output/html.pm
index 52fe241156..c96e3e5c5f 100644
--- a/source4/selftest/output/html.pm
+++ b/source4/selftest/output/html.pm
@@ -92,23 +92,25 @@ sub start_testsuite($$)
 	$self->print_html_header("Test Results for $state->{NAME}",
 		                     *TEST);
 
-	print TEST "<h2>Environment settings</h2>\n";
-
-	print TEST "  <table>\n";
-	print TEST "    <tr><td><b>Variable name</b></td><td><b>Variable value</b></td></tr>\n";
-	foreach (keys %{$state->{ENVVARS}}) {
-		print TEST "    <tr><td>$_</td><td>";
-		my $val = $state->{ENVVARS}->{$_};
-		if ($val =~ /^\.\// and -r $val) { 
-			print TEST "<a href=\"../$val\">$val</a>"; 
-		} elsif (-r $val) {
-			print TEST "<a href=\"$val\">$val</a>"; 
-		} else { 
-			print TEST $val; 
+	if ($state->{ENVNAME} ne "none") {
+		print TEST "<h2>Environment settings</h2>\n";
+
+		print TEST "  <table>\n";
+		print TEST "    <tr><td><b>Variable name</b></td><td><b>Variable value</b></td></tr>\n";
+		foreach (keys %{$state->{ENVVARS}}) {
+			print TEST "    <tr><td>$_</td><td>";
+			my $val = $state->{ENVVARS}->{$_};
+			if ($val =~ /^\.\// and -r $val) { 
+				print TEST "<a href=\"../$val\">$val</a>"; 
+			} elsif (-r $val) {
+				print TEST "<a href=\"$val\">$val</a>"; 
+			} else { 
+				print TEST $val; 
+			}
+			print TEST "</td></tr>\n";
 		}
-		print TEST "</td></tr>\n";
+		print TEST "  </table>\n";
 	}
-	print TEST "  </table>\n";
 
 	print TEST "<h2>Tests</h2>\n";
 
@@ -285,6 +287,7 @@ sub summary($)
 	print INDEX "</tr>\n";
 
 	print INDEX "</table>\n";
+	print INDEX "<a href=\"summary.html\">Summary</a>\n";
 	print INDEX "</center>\n";
 	$self->print_html_footer(*INDEX);
 	close(INDEX);
-- 
cgit