Various test cleanups

Message-ID: <20011030215626.A28503@rafael>

p4raw-id: //depot/perl@12795

diff --git a/ext/DB_File/t/db-btree.t b/ext/DB_File/t/db-btree.t
index eebbf86..7e0bb2b 100755 (executable)
--- a/ext/DB_File/t/db-btree.t
+++ b/ext/DB_File/t/db-btree.t
@@ -1,8 +1,5 @@
 #!./perl -w
 
-use warnings;
-use strict;
-
 BEGIN {
     unless(grep /blib/, @INC) {
         chdir 't' if -d 't';
@@ -10,12 +7,14 @@ BEGIN {
     }
 }
  
+use warnings;
+use strict;
 use Config;
  
 BEGIN {
     if(-d "lib" && -f "TEST") {
         if ($Config{'extensions'} !~ /\bDB_File\b/ ) {
-            print "1..163\n";
+            print "1..0 # Skip: DB_File was not built\n";
             exit 0;
         }
     }

diff --git a/ext/DB_File/t/db-hash.t b/ext/DB_File/t/db-hash.t
index f23c5f2..2413c0e 100755 (executable)
--- a/ext/DB_File/t/db-hash.t
+++ b/ext/DB_File/t/db-hash.t
@@ -1,8 +1,5 @@
 #!./perl 
 
-use warnings ;
-use strict ;
-
 BEGIN {
     unless(grep /blib/, @INC) {
         chdir 't' if -d 't';
@@ -10,12 +7,14 @@ BEGIN {
     }
 }
  
+use warnings;
+use strict;
 use Config;
  
 BEGIN {
     if(-d "lib" && -f "TEST") {
         if ($Config{'extensions'} !~ /\bDB_File\b/ ) {
-            print "1..111\n";
+            print "1..0 # Skip: DB_File was not built\n";
             exit 0;
         }
     }

diff --git a/ext/DB_File/t/db-recno.t b/ext/DB_File/t/db-recno.t
index 8090d48..748bedf 100755 (executable)
--- a/ext/DB_File/t/db-recno.t
+++ b/ext/DB_File/t/db-recno.t
@@ -1,8 +1,5 @@
 #!./perl -w
 
-use warnings;
-use strict ;
-
 BEGIN {
     unless(grep /blib/, @INC) {
         chdir 't' if -d 't';
@@ -10,12 +7,14 @@ BEGIN {
     }
 }
  
+use warnings;
+use strict;
 use Config;
  
 BEGIN {
     if(-d "lib" && -f "TEST") {
         if ($Config{'extensions'} !~ /\bDB_File\b/ ) {
-            print "1..138\n";
+            print "1..0 # Skip: DB_File was not built\n";
             exit 0;
         }
     }

diff --git a/ext/Encode.t b/ext/Encode.t
index ceeb422..1c61027 100644 (file)
--- a/ext/Encode.t
+++ b/ext/Encode.t
@@ -2,7 +2,7 @@ BEGIN {
     chdir 't' if -d 't';
     @INC = '../lib';
     require Config; import Config;
-    if ($Config{'extensions'} !~ /\Encode\b/) {
+    if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
     }