From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 3 Jun 2009 16:33:50 +0000 (+0200)
Subject: selftest: Avoid decreasing total testsuites if the original total is not
X-Git-Tag: tdb-1.1.5~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bdf76c9c214d6f12c379f8feefe120fdae84377;p=thirdparty%2Fsamba.git

selftest: Avoid decreasing total testsuites if the original total is not
known.
---

diff --git a/selftest/output/plain.pm b/selftest/output/plain.pm
index 509e0669102..20e5abc253a 100644
--- a/selftest/output/plain.pm
+++ b/selftest/output/plain.pm
@@ -143,7 +143,11 @@ sub end_test($$$$$)
 	my ($self, $parents, $testname, $result, $unexpected, $reason) = @_;
 	
 	if ($#$parents == -1) {
-		$self->end_testsuite($testname, $result, $unexpected, $reason);
+		if ($result eq "skip") {
+			$self->skip_testsuite($testname, $reason);
+		} else {
+			$self->end_testsuite($testname, $result, $unexpected, $reason);
+		}
 		return;
 	}
 
@@ -233,7 +237,9 @@ sub skip_testsuite($$)
 
 	push (@{$self->{skips}->{$reason}}, $name);
 
-	$self->{totalsuites}--;
+	if ($self->{totalsuites}) {
+		$self->{totalsuites}--;
+	}
 }
 
 1;