[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2266-gb8f36d3

[Jelmer Vernooij]

The branch, master has been updated
       via  b8f36d3eb8d04ec15a53816d78c851868916054f (commit)
       via  8fc36025821614bce8a828734c06161c2b39577e (commit)
      from  4c1a7d7556a38df73bb283ae2aa9476839105b26 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b8f36d3eb8d04ec15a53816d78c851868916054f
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Jun 12 00:19:02 2009 +0200

    selftest/buildfarm: Don't assume that a reason being specified is an indication of failure.

commit 8fc36025821614bce8a828734c06161c2b39577e
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Jun 12 00:08:19 2009 +0200

    subunit-filter: Print names of skipped testsuites.

-----------------------------------------------------------------------

Summary of changes:
 selftest/Subunit/Filter.pm   |    3 ++-
 selftest/output/buildfarm.pm |   11 +++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/Subunit/Filter.pm b/selftest/Subunit/Filter.pm
index 1bd4e5f..443baeb 100644
--- a/selftest/Subunit/Filter.pm
+++ b/selftest/Subunit/Filter.pm
@@ -92,7 +92,8 @@ sub end_test($$$$$)
 
 sub skip_testsuite($;$)
 {
-	Subunit::skip_testsuite(@_);
+	my ($self, $name, $reason) = @_;
+	Subunit::skip_testsuite($name, $reason);
 }
 
 sub start_testsuite($;$)
diff --git a/selftest/output/buildfarm.pm b/selftest/output/buildfarm.pm
index 09b84de..8612cfb 100644
--- a/selftest/output/buildfarm.pm
+++ b/selftest/output/buildfarm.pm
@@ -87,9 +87,16 @@ sub control_msg($$)
 	}
 }
 
-sub end_testsuite($$$$$$)
+sub end_testsuite($$$$$)
 {
-	my ($self, $name, $result, $unexpected, $reason) = @_;
+	my ($self, $name, $result, $reason) = @_;
+
+	my $unexpected;
+	if ($result eq "failure" or $result eq "fail" or $result eq "error") {
+		$unexpected = 1;
+	} else {
+		$unexpected = 0;
+	}
 
 	BuildFarm::end_testsuite($name, ($self->{last_time} - $self->{START_TIME}), 
 		                     (not $unexpected), $self->{test_output}->{$name}, 


-- 
Samba Shared Repository