r25124: Include link to summary page, hide environment variables for 'none' environment.

(This used to be commit 9fac2bd884bc325792d65bcdd166d785269655df)

diff --git a/source4/selftest/output/html.pm b/source4/selftest/output/html.pm
index 52fe241156f3a37390b702a5e45f0edc33c5fa1c..c96e3e5c5fe49930f71848120e6e9ff9608c6ff4 100644 (file)
--- 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);