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

jelmer at samba.org jelmer at samba.org
Fri Oct 26 21:15:06 GMT 2007


Author: jelmer
Date: 2007-10-26 21:15:04 +0000 (Fri, 26 Oct 2007)
New Revision: 25741

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

Log:
Simplify calls to Subunit functions.
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 17:13:42 UTC (rev 25740)
+++ branches/SAMBA_4_0/source/selftest/output/buildfarm.pm	2007-10-26 21:15:04 UTC (rev 25741)
@@ -97,18 +97,11 @@
 	my ($self) = @_;
 }
 
-sub missing_env($$$)
-{
-	my ($self, $name, $envname) = @_;
-
-	print "FAIL: $name (ENV[$envname] not available!)\n";
-}
-
 sub skip_testsuite($$$$)
 {
-	my ($self, $envname, $name, $reason) = @_;
+	my ($self, $name, $reason) = @_;
 
-	# Ignore skipped tests
+	print "SKIPPED: $name\n";
 }
 
 1;

Modified: branches/SAMBA_4_0/source/selftest/output/html.pm
===================================================================
--- branches/SAMBA_4_0/source/selftest/output/html.pm	2007-10-26 17:13:42 UTC (rev 25740)
+++ branches/SAMBA_4_0/source/selftest/output/html.pm	2007-10-26 21:15:04 UTC (rev 25741)
@@ -349,19 +349,12 @@
 	close(SUMMARY);
 }
 
-sub missing_env($$$)
-{
-	my ($self, $name, $envname) = @_;
-
-	$self->skip_testsuite($envname, $name, "environment `$envname` not available!");
-}
-
 sub skip_testsuite($$$$)
 {
-	my ($self, $envname, $name, $reason) = @_;
+	my ($self, $name, $reason) = @_;
 
 	push (@{$self->{error_summary}->{skip_testsuites}}, 
-		  [$envname, $name, $reason]);
+		  [$name, $reason]);
 }
 
 1;

Modified: branches/SAMBA_4_0/source/selftest/output/plain.pm
===================================================================
--- branches/SAMBA_4_0/source/selftest/output/plain.pm	2007-10-26 17:13:42 UTC (rev 25740)
+++ branches/SAMBA_4_0/source/selftest/output/plain.pm	2007-10-26 21:15:04 UTC (rev 25741)
@@ -120,17 +120,10 @@
 	}
 }
 
-sub missing_env($$$)
+sub skip_testsuite($$)
 {
-	my ($self, $name, $envname) = @_;
+	my ($self, $name, $reason) = @_;
 
-	print "FAIL: $name (ENV[$envname] not available!)\n";
-}
-
-sub skip_testsuite($$$)
-{
-	my ($self, $envname, $name, $reason) = @_;
-
 	if ($reason) {
 		print "SKIPPED: $name [$reason]\n";
 	} else {

Modified: branches/SAMBA_4_0/source/selftest/selftest.pl
===================================================================
--- branches/SAMBA_4_0/source/selftest/selftest.pl	2007-10-26 17:13:42 UTC (rev 25740)
+++ branches/SAMBA_4_0/source/selftest/selftest.pl	2007-10-26 21:15:04 UTC (rev 25741)
@@ -470,10 +470,10 @@
 	open(LF, "<$name") or die("unable to read $name: $!");
 	while (<LF>) { 
 		chomp; 
-		if (/^(.*?)([ \t]+)\#(.*)$/) {
-			push (@ret, [$1, $3]);
+		if (/^(.*?)([ \t]+)\#([\t ]*)(.*?)$/) {
+			push (@ret, [$1, $4]);
 		} else {
-			s/^(.*?)([ \t]+)\#(.*)$//;
+			s/^(.*?)([ \t]+)\#([\t ]*)(.*?)$//;
 			push (@ret, [$_, undef]); 
 		}
 	}
@@ -783,7 +783,7 @@
 		
 		my $skipreason = skip($name);
 		if ($skipreason) {
-			$msg_ops->skip_testsuite($envname, $name, $skipreason);
+			$msg_ops->skip_testsuite($name, $skipreason);
 			$statistics->{SUITES_SKIPPED}++;
 			next;
 		}
@@ -791,7 +791,7 @@
 		my $envvars = setup_env($envname);
 		if (not defined($envvars)) {
 			$statistics->{SUITES_SKIPPED}++;
-			$msg_ops->missing_env($name, $envname);
+			$msg_ops->skip_testsuite($name, "unable to set up environment $envname");
 			next;
 		}
 



More information about the samba-cvs mailing list