r25110: Show environment variables in HTML output.

(This used to be commit 62e770ace32f0e38863d4020773562e74117fc65)

diff --git a/.bzrignore b/.bzrignore
index 39d94e8dcb608fc989ce636ff3fc093987e9f49f..2e3c3ac05adc167699e9d11a18859554f2525232 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -197,3 +197,4 @@ source/lib/tdb/bin/tdbdump
 source/lib/registry/tools/common.h
 source/librpc/ndr/ndr_table.h
 test-results
+source/lib/ldb-samba/ldif_handlers.h

diff --git a/source4/selftest/output/html.pm b/source4/selftest/output/html.pm
index 7f5d1289838f3a5847a1f33908d9993bf34826b6..52fe241156f3a37390b702a5e45f0edc33c5fa1c 100644 (file)
--- a/source4/selftest/output/html.pm
+++ b/source4/selftest/output/html.pm
@@ -91,6 +91,27 @@ 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; 
+               }
+               print TEST "</td></tr>\n";
+       }
+       print TEST "  </table>\n";
+
+       print TEST "<h2>Tests</h2>\n";
+
        print TEST "  <table>\n";
 }
 

diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl
index 5b5c0146adc0dbf78f175edb91c8b1f5fb8cba18..7089cfa022e8147287d9111a4712bc7600994627 100755 (executable)
--- a/source4/selftest/selftest.pl
+++ b/source4/selftest/selftest.pl
@@ -226,11 +226,12 @@ sub cleanup_pcap($$$)
        $state->{PCAP_FILE} = undef;
 }
 
-sub run_testsuite($$$$$$)
+sub run_testsuite($$$$$$$)
 {
-       my ($envname, $name, $cmd, $i, $totalsuites, $msg_ops) = @_;
+       my ($envname, $envvars, $name, $cmd, $i, $totalsuites, $msg_ops) = @_;
        my $msg_state = {
                ENVNAME => $envname,
+               ENVVARS => $envvars,
                NAME    => $name,
                CMD     => $cmd,
                INDEX   => $i,
@@ -755,7 +756,8 @@ $envvarstr
                        next;
                }
 
-               run_testsuite($envname, $name, $cmd, $i, $suitestotal, $msg_ops);
+               run_testsuite($envname, $envvars, $name, $cmd, $i, $suitestotal, 
+                             $msg_ops);
 
                if (defined($opt_analyse_cmd)) {
                        system("$opt_analyse_cmd \"$name\"");