a few random cleanups

p4raw-id: //depot/perl@2640

diff --git a/ext/B/Makefile.PL b/ext/B/Makefile.PL
index 35cc6bf..ff3694d 100644 (file)
--- a/ext/B/Makefile.PL
+++ b/ext/B/Makefile.PL
@@ -18,7 +18,7 @@ WriteMakefile(
     VERSION    => "a5",
     MAN3PODS => {},
     clean      => {
-       FILES           => "perl$e byteperl$e *$o B.c *~"
+       FILES           => "perl$e byteperl$e *$o B.c defsubs.h *~"
     }
 );   
 

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";

diff --git a/t/pragma/warn/doio b/t/pragma/warn/doio
index 993c34d..cd0d558 100644 (file)
--- a/t/pragma/warn/doio
+++ b/t/pragma/warn/doio
@@ -104,11 +104,11 @@ use warning 'io' ;
 exec "lskdjfalksdjfdjfkls","" ;
 EXPECT
 OPTION regex
-Can't exec "lskdjfalksdjfdjfkls": .+ at - line 3.
+Can't exec "lskdjfalksdjfdjfkls": .+
 ########
 # doio.c
 use warning 'io' ;
 exec "lskdjfalksdjfdjfkls", "abc" ;
 EXPECT
 OPTION regex
-Can't exec "lskdjfalksdjfdjfkls": .+ at - line 3.
+Can't exec "lskdjfalksdjfdjfkls": .+