selftest: Avoid decreasing total testsuites if the original total is not

[sfrench/samba-autobuild/.git] / selftest / output / plain.pm

diff --git a/selftest/output/plain.pm b/selftest/output/plain.pm
index 509e0669102f2d409fa7066066fe90434293adcd..20e5abc253abb7fcd520ab213b8487f024b2226c 100644 (file)
--- 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;