a few random cleanups

[p5sagit/p5-mst-13.2.git] / lib / Test / Harness.pm

diff --git a/lib/Test/Harness.pm b/lib/Test/Harness.pm
index 935e8f0..219ffb9 100644 (file)
--- a/lib/Test/Harness.pm
+++ b/lib/Test/Harness.pm
@@ -243,14 +243,17 @@ sub runtests {
               " UNEXPECTEDLY SUCCEEDED)")
        if $totbonus;
     if ($tests_skipped) {
-       $bonusmsg .= ", $tests_skipped test" . ($tests_skipped != 1 ? 's' : '') .
-                       ' skipped';
+       $bonusmsg .= ", $tests_skipped test" . ($tests_skipped != 1 ? 's' : '');
+       if ($subtests_skipped) {
+           $bonusmsg .= " and $subtests_skipped subtest"
+                        . ($subtests_skipped != 1 ? 's' : '');
+       }
+       $bonusmsg .= ' skipped';
     }
-    if ($subtests_skipped) {
-       $bonusmsg .= ($tests_skipped ? ', plus ' : ', '). 
-                       "$subtests_skipped subtest"
-                       . ($subtests_skipped != 1 ? 's' : '') .
-                       " skipped";
+    elsif ($subtests_skipped) {
+       $bonusmsg .= ", $subtests_skipped subtest"
+                    . ($subtests_skipped != 1 ? 's' : '')
+                    . " skipped";
     }
     if ($bad == 0 && $totmax) {
        print "All tests successful$bonusmsg.\n";