Partial minitest fix-up

While minitest passes all its tests when everything has been
built, it is sometimes useful to run it when nothing has been
built but miniperl (especially when one is working on low-level
stuff that breaks miniperl).  Many tests fail if things have
not been built yet because miniperl can’t find modules like
re.pm.  This patch fixes up some tests to find those modules
and changes _charnames.pm to load File::Spec only when it
needs it.

There are still many more failures, but I’ll leave the rest
for another time (or another hacker :-).

diff --git a/lib/_charnames.pm b/lib/_charnames.pm
index 92286c2..b27fd05 100644 (file)
--- a/lib/_charnames.pm
+++ b/lib/_charnames.pm
@@ -6,7 +6,6 @@
 package _charnames;
 use strict;
 use warnings;
-use File::Spec;
 our $VERSION = '1.41';
 use unicore::Name;    # mktables-generated algorithmically-defined names
 
@@ -237,6 +236,7 @@ sub not_legal_use_bytes_msg {
 
 sub alias_file ($)  # Reads a file containing alias definitions
 {
+  require File::Spec;
   my ($arg, $file) = @_;
   if (-f $arg && File::Spec->file_name_is_absolute ($arg)) {
     $file = $arg;

diff --git a/t/comp/hints.t b/t/comp/hints.t
index 9a08854..391287c 100644 (file)
--- a/t/comp/hints.t
+++ b/t/comp/hints.t
@@ -3,7 +3,7 @@
 # Tests the scoping of $^H and %^H
 
 BEGIN {
-    @INC = qw(. ../lib);
+    @INC = qw(. ../lib ../ext/re);
     chdir 't';
 }
 

diff --git a/t/comp/require.t b/t/comp/require.t
index 4eafce4..f817527 100644 (file)
--- a/t/comp/require.t
+++ b/t/comp/require.t
@@ -3,7 +3,7 @@
 BEGIN {
     chdir 't' if -d 't';
     @INC = '.';
-    push @INC, '../lib';
+    push @INC, '../lib', '../ext/re';
 }
 
 sub do_require {

diff --git a/t/re/overload.t b/t/re/overload.t
index dba0357..ee821f1 100644 (file)
--- a/t/re/overload.t
+++ b/t/re/overload.t
@@ -2,7 +2,7 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    @INC = '../lib';
+    @INC = qw '../lib ../ext/re';
     require './test.pl';
 }
 

diff --git a/t/re/pat.t b/t/re/pat.t
index 62ce76a..ec4eea0 100644 (file)
--- a/t/re/pat.t
+++ b/t/re/pat.t
@@ -15,7 +15,7 @@ $| = 1;
 
 BEGIN {
     chdir 't' if -d 't';
-    @INC = ('../lib','.');
+    @INC = ('../lib','.','../ext/re');
     require Config; import Config;
     require './test.pl';
 }

diff --git a/t/re/reg_mesg.t b/t/re/reg_mesg.t
index 2c54cc3..d4df2ec 100644 (file)
--- a/t/re/reg_mesg.t
+++ b/t/re/reg_mesg.t
@@ -2,7 +2,7 @@
 
 BEGIN {
        chdir 't' if -d 't';
-       @INC = '../lib';
+       @INC = qw '../lib ../ext/re';
        require './test.pl';
        eval 'require Config'; # assume defaults if this fails
 }

diff --git a/t/re/regex_sets.t b/t/re/regex_sets.t
index 9ddceae..2df6148 100644 (file)
--- a/t/re/regex_sets.t
+++ b/t/re/regex_sets.t
@@ -12,7 +12,7 @@ $| = 1;
 
 BEGIN {
     chdir 't' if -d 't';
-    @INC = ('../lib','.');
+    @INC = ('../lib','.','../ext/re');
     require './test.pl';
 }
 

diff --git a/t/re/regexp.t b/t/re/regexp.t
index ac211ca..fd1da7c 100644 (file)
--- a/t/re/regexp.t
+++ b/t/re/regexp.t
@@ -59,7 +59,7 @@ BEGIN {
     }
 
     chdir 't' if -d 't';
-    @INC = '../lib';
+    @INC = qw '../lib ../ext/re';
 
 }