svn commit: samba r25742 - in branches/SAMBA_4_0: . source/selftest
source/selftest/output
jelmer at samba.org
jelmer at samba.org
Fri Oct 26 21:25:44 GMT 2007
Author: jelmer
Date: 2007-10-26 21:25:43 +0000 (Fri, 26 Oct 2007)
New Revision: 25742
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25742
Log:
Start trimming down hash size for start_testsuite.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/selftest/output/buildfarm.pm
branches/SAMBA_4_0/source/selftest/output/html.pm
branches/SAMBA_4_0/source/selftest/output/plain.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/source/selftest/output/buildfarm.pm
===================================================================
--- branches/SAMBA_4_0/source/selftest/output/buildfarm.pm 2007-10-26 21:15:04 UTC (rev 25741)
+++ branches/SAMBA_4_0/source/selftest/output/buildfarm.pm 2007-10-26 21:25:43 UTC (rev 25742)
@@ -16,21 +16,21 @@
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 @@
$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 @@
$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 @@
$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";
Modified: branches/SAMBA_4_0/source/selftest/output/html.pm
===================================================================
--- branches/SAMBA_4_0/source/selftest/output/html.pm 2007-10-26 21:15:04 UTC (rev 25741)
+++ branches/SAMBA_4_0/source/selftest/output/html.pm 2007-10-26 21:25:43 UTC (rev 25742)
@@ -73,9 +73,9 @@
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 @@
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 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 @@
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) {
Modified: branches/SAMBA_4_0/source/selftest/output/plain.pm
===================================================================
--- branches/SAMBA_4_0/source/selftest/output/plain.pm 2007-10-26 21:15:04 UTC (rev 25741)
+++ branches/SAMBA_4_0/source/selftest/output/plain.pm 2007-10-26 21:25:43 UTC (rev 25742)
@@ -20,17 +20,17 @@
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 @@
$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 @@
}
if ($ret != $expected_ret and $self->{immediate} and not $self->{verbose}) {
- $out .= $self->{test_output}->{$state->{NAME}};
+ $out .= $self->{test_output}->{$name};
}
print $out;
Modified: branches/SAMBA_4_0/source/selftest/selftest.pl
===================================================================
--- branches/SAMBA_4_0/source/selftest/selftest.pl 2007-10-26 21:15:04 UTC (rev 25741)
+++ branches/SAMBA_4_0/source/selftest/selftest.pl 2007-10-26 21:25:43 UTC (rev 25742)
@@ -250,7 +250,7 @@
my $msg_state = {
ENVNAME => $envname,
ENVVARS => $envvars,
- NAME => $name,
+ NAME => $name,
CMD => $cmd,
INDEX => $i,
TOTAL => $totalsuites,
@@ -260,7 +260,7 @@
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 @@
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
More information about the samba-cvs
mailing list