r25742: Start trimming down hash size for start_testsuite.

(This used to be commit f2319fbe9be76966c81f3d4279f6bc2a631a3a5a)

4 files changed, 26 insertions, 27 deletions

diff --git a/source4/selftest/output/buildfarm.pm b/source4/selftest/output/buildfarm.pm
index b5971e47ad..f3ad9319b4 100644
--- a/source4/selftest/output/buildfarm.pm
+++ b/source4/selftest/output/buildfarm.pm
@@ -16,21 +16,21 @@ sub new($$$$) {
 	bless($self, $class);
 }
 
-sub start_testsuite($$)
+sub start_testsuite($$$)
 {
-	my ($self, $state) = @_;
+	my ($self, $name, $state) = @_;
 	my $out = "";
 
 	my $duration = $state->{START_TIME} - $self->{statistics}->{START_TIME};
 	$out .= "--==--==--==--==--==--==--==--==--==--==--\n";
-	$out .= "Running test $state->{NAME} (level 0 stdout)\n";
+	$out .= "Running test $name (level 0 stdout)\n";
 	$out .= "--==--==--==--==--==--==--==--==--==--==--\n";
 	$out .= scalar(localtime())."\n";
 	$out .= "SELFTEST RUNTIME: " . $duration . "s\n";
-	$out .= "NAME: $state->{NAME}\n";
+	$out .= "NAME: $name\n";
 	$out .= "CMD: $state->{CMD}\n";
 
-	$self->{test_output}->{$state->{NAME}} = "";
+	$self->{test_output}->{$name} = "";
 
 	print $out;
 }
@@ -49,9 +49,9 @@ sub control_msg($$$)
 	$self->{test_output}->{$state->{NAME}} .= $output;
 }
 
-sub end_testsuite($$$$$)
+sub end_testsuite($$$$$$)
 {
-	my ($self, $state, $expected_ret, $ret, $envlog) = @_;
+	my ($self, $name, $state, $expected_ret, $ret, $envlog) = @_;
 	my $out = "";
 
 	$out .= "TEST RUNTIME: " . (time() - $state->{START_TIME}) . "s\n";
@@ -60,7 +60,7 @@ sub end_testsuite($$$$$)
 		$out .= "ALL OK\n";
 	} else {
 		$out .= "ERROR: $ret\n";
-		$out .= $self->{test_output}->{$state->{NAME}};
+		$out .= $self->{test_output}->{$name};
 	}
 
 	$out .= "PCAP FILE: $state->{PCAP_FILE}\n" if defined($state->{PCAP_FILE});
@@ -69,9 +69,9 @@ sub end_testsuite($$$$$)
 
 	$out .= "==========================================\n";
 	if ($ret == $expected_ret) {
-		$out .= "TEST PASSED: $state->{NAME}\n";
+		$out .= "TEST PASSED: $name\n";
 	} else {
-		$out .= "TEST FAILED: $state->{NAME} (status $ret)\n";
+		$out .= "TEST FAILED: $name (status $ret)\n";
 	}
 	$out .= "==========================================\n";
 
diff --git a/source4/selftest/output/html.pm b/source4/selftest/output/html.pm
index b8ee60edf7..9e83821bc1 100644
--- a/source4/selftest/output/html.pm
+++ b/source4/selftest/output/html.pm
@@ -73,9 +73,9 @@ sub print_html_footer($$)
 
 sub output_msg($$$);
 
-sub start_testsuite($$)
+sub start_testsuite($$$)
 {
-	my ($self, $state) = @_;
+	my ($self, $name, $state) = @_;
 
 	$self->{local_statistics} = {
 		success => 0,
@@ -84,13 +84,12 @@ sub start_testsuite($$)
 		failure => 0
 	};
 
-	$state->{HTMLFILE} = "$state->{NAME}.html";
+	$state->{HTMLFILE} = "$name.html";
 	$state->{HTMLFILE} =~ s/[:\t\n \/]/_/g;
 
 	open(TEST, ">$self->{dirname}/$state->{HTMLFILE}") or die("Unable to open $state->{HTMLFILE} for writing");
 
-	$self->print_html_header("Test Results for $state->{NAME}",
-		                     *TEST);
+	$self->print_html_header("Test Results for $name", *TEST);
 
 	if ($state->{ENVNAME} ne "none") {
 		print TEST "<h2>Environment settings</h2>\n";
@@ -137,7 +136,7 @@ sub output_msg($$$)
 
 sub end_testsuite($$$$$)
 {
-	my ($self, $state, $expected_ret, $ret, $envlog) = @_;
+	my ($self, $name, $state, $expected_ret, $ret, $envlog) = @_;
 
 	print TEST "</table>\n";
 
@@ -149,7 +148,7 @@ sub end_testsuite($$$$$)
 	close(TEST);
 
 	print INDEX "<tr>\n";
-	print INDEX "  <td class=\"testSuite\"><a href=\"$state->{HTMLFILE}\">$state->{NAME}</a></td>\n";
+	print INDEX "  <td class=\"testSuite\"><a href=\"$state->{HTMLFILE}\">$name</a></td>\n";
 	my $st = $self->{local_statistics};
 
 	if ($ret == $expected_ret) {
diff --git a/source4/selftest/output/plain.pm b/source4/selftest/output/plain.pm
index 0f70c6085e..59b89f84c9 100644
--- a/source4/selftest/output/plain.pm
+++ b/source4/selftest/output/plain.pm
@@ -20,17 +20,17 @@ sub new($$$$) {
 
 sub output_msg($$$);
 
-sub start_testsuite($$)
+sub start_testsuite($$$)
 {
-	my ($self, $state) = @_;
+	my ($self, $name, $state) = @_;
 	my $out = "";
 
 	my $duration = $state->{START_TIME} - $self->{statistics}->{START_TIME};
 	$out .= "[$state->{INDEX}/$state->{TOTAL} in ".$duration."s";
 	$out .= sprintf(", %d errors", $self->{statistics}->{SUITES_FAIL}) if ($self->{statistics}->{SUITES_FAIL} > 0);
-	$out .= "] $state->{NAME}\n", 
+	$out .= "] $name\n", 
 
-	$self->{test_output}->{$state->{NAME}} = "" unless($self->{verbose});
+	$self->{test_output}->{$name} = "" unless($self->{verbose});
 
 	$self->output_msg($state, "CMD: $state->{CMD}\n");
 
@@ -55,9 +55,9 @@ sub control_msg($$$)
 	$self->output_msg($state, $output);
 }
 
-sub end_testsuite($$$$$)
+sub end_testsuite($$$$$$)
 {
-	my ($self, $state, $expected_ret, $ret, $envlog) = @_;
+	my ($self, $name, $state, $expected_ret, $ret, $envlog) = @_;
 	my $out = "";
 
 	$self->output_msg($state, "ENVLOG: $envlog\n") if ($envlog ne "");
@@ -67,7 +67,7 @@ sub end_testsuite($$$$$)
 	}
 
 	if ($ret != $expected_ret and $self->{immediate} and not $self->{verbose}) {
-		$out .= $self->{test_output}->{$state->{NAME}};
+		$out .= $self->{test_output}->{$name};
 	}
 
 	print $out;
diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl
index 810a6f31c0..69f60cbcf1 100755
--- a/source4/selftest/selftest.pl
+++ b/source4/selftest/selftest.pl
@@ -250,7 +250,7 @@ sub run_testsuite($$$$$$$)
 	my $msg_state = {
 		ENVNAME	=> $envname,
 		ENVVARS => $envvars,
-		NAME	=> $name,
+		NAME => $name,
 		CMD	=> $cmd,
 		INDEX	=> $i,
 		TOTAL	=> $totalsuites,
@@ -260,7 +260,7 @@ sub run_testsuite($$$$$$$)
 	setup_pcap($msg_state);
 
 	open(RESULT, "$cmd 2>&1|");
-	$msg_ops->start_testsuite($msg_state);
+	$msg_ops->start_testsuite($name, $msg_state);
 
 	my $expected_ret = parse_results(
 		$msg_ops, $msg_state, $statistics, *RESULT, \&expecting_failure);
@@ -270,7 +270,7 @@ sub run_testsuite($$$$$$$)
 
 	cleanup_pcap($msg_state, $expected_ret, $ret);
 
-	$msg_ops->end_testsuite($msg_state, $expected_ret, $ret,
+	$msg_ops->end_testsuite($name, $msg_state, $expected_ret, $ret,
 							getlog_env($msg_state->{ENVNAME}));
 
 	if (not $opt_socket_wrapper_keep_pcap and