Set @INC earlier

Message-ID: <Pine.SOL.4.10.10204031618150.20955-100000@maxwell.phys.lafayette.edu>

p4raw-id: //depot/perl@15717

diff --git a/lib/AnyDBM_File.t b/lib/AnyDBM_File.t
index 7bb1e49..449c638 100755 (executable)
--- a/lib/AnyDBM_File.t
+++ b/lib/AnyDBM_File.t
@@ -2,19 +2,17 @@
 
 # $RCSfile: dbm.t,v $$Revision: 4.1 $$Date: 92/08/07 18:27:43 $
 
-use Test::More;
-
 BEGIN {
     chdir 't' if -d 't';
     @INC = '../lib';
     require Config; import Config;
+    require Test::More; import Test::More;
     if (($Config{'extensions'} !~ /\b(DB|[A-Z]DBM)_File\b/) ){
-      plan skip_all => "1..0 # Skipping (no DB_File or [A-Z]DBM_File)\n";
+       plan(skip_all, "1..0 # Skipping (no DB_File or [A-Z]DBM_File)\n");
     }
     else {
-       plan tests => 12;
+       plan(tests, 12);
     }
-
 }
 
 require AnyDBM_File;

diff --git a/lib/sort.t b/lib/sort.t
index dbbf82e..c132a5c 100644 (file)
--- a/lib/sort.t
+++ b/lib/sort.t
@@ -3,9 +3,6 @@
 # This tests the behavior of sort() under the different 'use sort' forms.
 # Algorithm by John P. Linderman.
 
-use strict;
-use warnings;
-
 my ($BigWidth, $BigEnough, $RootWidth, $ItemFormat, @TestSizes, $WellSoaked);
 
 BEGIN {
@@ -25,6 +22,9 @@ BEGIN {
     }
 }
 
+use strict;
+use warnings;
+
 use Test::More tests => @TestSizes * 2 # sort() tests
                        * 4             # number of pragmas to test
                        + 1             # extra test for qsort instability