svn commit: samba r25110 - in branches/SAMBA_4_0: . source/selftest source/selftest/output

[jelmer at samba.org]

Author: jelmer
Date: 2007-09-11 23:53:25 +0000 (Tue, 11 Sep 2007)
New Revision: 25110

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25110

Log:
Show environment variables in HTML output.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/.bzrignore
   branches/SAMBA_4_0/source/selftest/output/html.pm
   branches/SAMBA_4_0/source/selftest/selftest.pl


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/.bzrignore
===================================================================
--- branches/SAMBA_4_0/.bzrignore	2007-09-11 23:35:17 UTC (rev 25109)
+++ branches/SAMBA_4_0/.bzrignore	2007-09-11 23:53:25 UTC (rev 25110)
@@ -197,3 +197,4 @@
 source/lib/registry/tools/common.h
 source/librpc/ndr/ndr_table.h
 test-results
+source/lib/ldb-samba/ldif_handlers.h

Modified: branches/SAMBA_4_0/source/selftest/output/html.pm
===================================================================
--- branches/SAMBA_4_0/source/selftest/output/html.pm	2007-09-11 23:35:17 UTC (rev 25109)
+++ branches/SAMBA_4_0/source/selftest/output/html.pm	2007-09-11 23:53:25 UTC (rev 25110)
@@ -91,7 +91,28 @@
 
 	$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";
 }
 
 sub control_msg($$$)

Modified: branches/SAMBA_4_0/source/selftest/selftest.pl
===================================================================
--- branches/SAMBA_4_0/source/selftest/selftest.pl	2007-09-11 23:35:17 UTC (rev 25109)
+++ branches/SAMBA_4_0/source/selftest/selftest.pl	2007-09-11 23:53:25 UTC (rev 25110)
@@ -226,11 +226,12 @@
 	$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 @@
 			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\"");