Put miniperl @INC logic in test.pl

diff --git a/t/op/avhv.t b/t/op/avhv.t
index 6d9d47c..39a54dc 100644 (file)
--- a/t/op/avhv.t
+++ b/t/op/avhv.t
@@ -6,8 +6,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 require Tie::Array;

diff --git a/t/op/blocks.t b/t/op/blocks.t
index 3b406be..bfab9e0 100644 (file)
--- a/t/op/blocks.t
+++ b/t/op/blocks.t
@@ -3,8 +3,7 @@
 BEGIN {
     chdir 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 plan tests => 7;

diff --git a/t/op/closure.t b/t/op/closure.t
index 42b6991..569724f 100644 (file)
--- a/t/op/closure.t
+++ b/t/op/closure.t
@@ -9,8 +9,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 use Config;

diff --git a/t/op/eval.t b/t/op/eval.t
index ac33758..fcfe675 100644 (file)
--- a/t/op/eval.t
+++ b/t/op/eval.t
@@ -3,8 +3,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 plan(tests => 132);

diff --git a/t/op/filetest.t b/t/op/filetest.t
index 880978f..91ebe9c 100644 (file)
--- a/t/op/filetest.t
+++ b/t/op/filetest.t
@@ -6,8 +6,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, qw '../lib ../cpan/Perl-OSType/lib';
+    set_up_inc(qw '../lib ../cpan/Perl-OSType/lib');
 }
 
 plan(tests => 53 + 27*14);

diff --git a/t/op/gv.t b/t/op/gv.t
index 8e141d1..5fa8d6d 100644 (file)
--- a/t/op/gv.t
+++ b/t/op/gv.t
@@ -7,8 +7,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 use warnings;

diff --git a/t/op/hash.t b/t/op/hash.t
index 3f787b1..429eb38 100644 (file)
--- a/t/op/hash.t
+++ b/t/op/hash.t
@@ -3,8 +3,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 use strict;

diff --git a/t/op/inccode.t b/t/op/inccode.t
index 41e31d2..016b425 100644 (file)
--- a/t/op/inccode.t
+++ b/t/op/inccode.t
@@ -5,8 +5,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 use Config;

diff --git a/t/op/index.t b/t/op/index.t
index 86a1fd7..2bb6cd1 100644 (file)
--- a/t/op/index.t
+++ b/t/op/index.t
@@ -3,8 +3,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
     require './charset_tools.pl';
 }
 

diff --git a/t/op/kvaslice.t b/t/op/kvaslice.t
index 239c0d1..16ee446 100644 (file)
--- a/t/op/kvaslice.t
+++ b/t/op/kvaslice.t
@@ -3,8 +3,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 # use strict;

diff --git a/t/op/kvhslice.t b/t/op/kvhslice.t
index 3dd9960..a5357ad 100644 (file)
--- a/t/op/kvhslice.t
+++ b/t/op/kvhslice.t
@@ -3,8 +3,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 # use strict;

diff --git a/t/op/lc.t b/t/op/lc.t
index bd843dc..3004ea3 100644 (file)
--- a/t/op/lc.t
+++ b/t/op/lc.t
@@ -5,8 +5,7 @@
 BEGIN {
     chdir 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
     require Config; import Config;
     if (is_miniperl()) {
         skip_all_if_miniperl("Unicode tables not built yet")

diff --git a/t/op/length.t b/t/op/length.t
index e7be3aa..2cba924 100644 (file)
--- a/t/op/length.t
+++ b/t/op/length.t
@@ -3,8 +3,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 plan (tests => 41);

diff --git a/t/op/lexsub.t b/t/op/lexsub.t
index 90f00a5..e37fba1 100644 (file)
--- a/t/op/lexsub.t
+++ b/t/op/lexsub.t
@@ -3,8 +3,7 @@
 BEGIN {
     chdir 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
     *bar::is = *is;
     *bar::like = *like;
 }

diff --git a/t/op/my_stash.t b/t/op/my_stash.t
index b058fcd..1e728e2 100644 (file)
--- a/t/op/my_stash.t
+++ b/t/op/my_stash.t
@@ -5,8 +5,7 @@ package Foo;
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 plan 9;

diff --git a/t/op/override.t b/t/op/override.t
index 31889a4..1d45617 100644 (file)
--- a/t/op/override.t
+++ b/t/op/override.t
@@ -3,8 +3,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, qw '../lib ../cpan/Text-ParseWords/lib';
+    set_up_inc(qw '../lib ../cpan/Text-ParseWords/lib');
     require Config; # load these before we mess with *CORE::GLOBAL::require
     require 'Config_heavy.pl'; # since runperl will need them
 }

diff --git a/t/op/pack.t b/t/op/pack.t
index a7778ab..9340f32 100644 (file)
--- a/t/op/pack.t
+++ b/t/op/pack.t
@@ -3,8 +3,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, qw '../lib ../dist/Math-BigInt/lib';
+    set_up_inc(qw '../lib ../dist/Math-BigInt/lib');
 }
 
 # This is truth in an if statement, and could be a skip message

diff --git a/t/op/push.t b/t/op/push.t
index 34fc41f..f4b034f 100644 (file)
--- a/t/op/push.t
+++ b/t/op/push.t
@@ -3,8 +3,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 @tests = split(/\n/, <<EOF);

diff --git a/t/op/readline.t b/t/op/readline.t
index f88f022..0c5619f 100644 (file)
--- a/t/op/readline.t
+++ b/t/op/readline.t
@@ -3,8 +3,7 @@
 BEGIN {
     chdir 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 plan tests => 30;

diff --git a/t/op/reverse.t b/t/op/reverse.t
index fae4ccf..059ece2 100644 (file)
--- a/t/op/reverse.t
+++ b/t/op/reverse.t
@@ -3,8 +3,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 plan tests => 26;

diff --git a/t/op/smartkve.t b/t/op/smartkve.t
index 4e367af..bab5d61 100644 (file)
--- a/t/op/smartkve.t
+++ b/t/op/smartkve.t
@@ -3,8 +3,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 use strict;
 use warnings;

diff --git a/t/op/smartmatch.t b/t/op/smartmatch.t
index 5804c11..bbd6372 100644 (file)
--- a/t/op/smartmatch.t
+++ b/t/op/smartmatch.t
@@ -3,8 +3,7 @@
 BEGIN {
     chdir 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 use strict;
 use warnings;

diff --git a/t/op/sort.t b/t/op/sort.t
index 6e608c0..59757e1 100644 (file)
--- a/t/op/sort.t
+++ b/t/op/sort.t
@@ -3,8 +3,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 use warnings;
 plan( tests => 182 );

diff --git a/t/op/split.t b/t/op/split.t
index a6202e5..007eb00 100644 (file)
--- a/t/op/split.t
+++ b/t/op/split.t
@@ -3,8 +3,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 plan tests => 119;

diff --git a/t/op/sub.t b/t/op/sub.t
index 0343f86..1d865bf 100644 (file)
--- a/t/op/sub.t
+++ b/t/op/sub.t
@@ -3,8 +3,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 plan( tests => 37 );

diff --git a/t/op/substr.t b/t/op/substr.t
index 0bfdfb3..801895d 100644 (file)
--- a/t/op/substr.t
+++ b/t/op/substr.t
@@ -5,8 +5,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 use warnings ;
 

diff --git a/t/op/taint.t b/t/op/taint.t
index 1c23c76..cb9074d 100644 (file)
--- a/t/op/taint.t
+++ b/t/op/taint.t
@@ -10,8 +10,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 use strict;

diff --git a/t/op/tie_fetch_count.t b/t/op/tie_fetch_count.t
index 1335d9e..c97b9b4 100644 (file)
--- a/t/op/tie_fetch_count.t
+++ b/t/op/tie_fetch_count.t
@@ -6,8 +6,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
     plan (tests => 312);
 }
 

diff --git a/t/op/tiehandle.t b/t/op/tiehandle.t
index 64bd2e6..21f56fc 100644 (file)
--- a/t/op/tiehandle.t
+++ b/t/op/tiehandle.t
@@ -3,8 +3,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, qw '../lib ../dist/base/lib';
+    set_up_inc(qw '../lib ../dist/base/lib');
 }
 
 my @expect;

diff --git a/t/op/tr.t b/t/op/tr.t
index fd69999..8a7dd8a 100644 (file)
--- a/t/op/tr.t
+++ b/t/op/tr.t
@@ -5,8 +5,7 @@ use utf8;
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 plan tests => 134;

diff --git a/t/op/universal.t b/t/op/universal.t
index 0bd7bb6..116f923 100644 (file)
--- a/t/op/universal.t
+++ b/t/op/universal.t
@@ -6,8 +6,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, qw '../lib ../dist/base/lib';
+    set_up_inc(qw '../lib ../dist/base/lib');
     $| = 1;
     require "./test.pl";
 }

diff --git a/t/op/utftaint.t b/t/op/utftaint.t
index 5f68216..da4f842 100644 (file)
--- a/t/op/utftaint.t
+++ b/t/op/utftaint.t
@@ -4,8 +4,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 use strict;

diff --git a/t/op/vec.t b/t/op/vec.t
index 636ef1d..141a6da 100644 (file)
--- a/t/op/vec.t
+++ b/t/op/vec.t
@@ -3,8 +3,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 plan( tests => 35 );

diff --git a/t/op/warn.t b/t/op/warn.t
index 61be312..4d679c2 100644 (file)
--- a/t/op/warn.t
+++ b/t/op/warn.t
@@ -4,7 +4,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl(); unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 plan 32;

diff --git a/t/op/write.t b/t/op/write.t
index 30d6def..653561f 100644 (file)
--- a/t/op/write.t
+++ b/t/op/write.t
@@ -3,8 +3,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 use strict;    # Amazed that this hackery can be made strict ...

diff --git a/t/re/pat_re_eval.t b/t/re/pat_re_eval.t
index b041828..c77439a 100644 (file)
--- a/t/re/pat_re_eval.t
+++ b/t/re/pat_re_eval.t
@@ -18,8 +18,7 @@ $| = 1;
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 

diff --git a/t/re/reg_eval_scope.t b/t/re/reg_eval_scope.t
index ba34bd8..0eaeeb9 100644 (file)
--- a/t/re/reg_eval_scope.t
+++ b/t/re/reg_eval_scope.t
@@ -5,8 +5,7 @@
 BEGIN {
     chdir 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, qw(lib ../lib);
+    set_up_inc(qw(lib ../lib));
 }
 
 plan 48;

diff --git a/t/re/rxcode.t b/t/re/rxcode.t
index c12e20e..263c234 100644 (file)
--- a/t/re/rxcode.t
+++ b/t/re/rxcode.t
@@ -3,8 +3,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
 }
 
 plan tests => 40;

diff --git a/t/re/subst.t b/t/re/subst.t
index 193dfb4..7b9a44b 100644 (file)
--- a/t/re/subst.t
+++ b/t/re/subst.t
@@ -3,8 +3,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
     require Config; import Config;
     require './charset_tools.pl';
 }

diff --git a/t/test.pl b/t/test.pl
index 13db432..60ddf63 100644 (file)
--- a/t/test.pl
+++ b/t/test.pl
@@ -105,6 +105,12 @@ sub is_miniperl {
     return !defined &DynaLoader::boot_DynaLoader;
 }
 
+sub set_up_inc {
+    # Don’t clobber @INC under miniperl
+    @INC = () unless is_miniperl;
+    unshift @INC, @_;
+}
+
 sub _comment {
     return map { /^#/ ? "$_\n" : "# $_\n" }
            map { split /\n/ } @_;

diff --git a/t/uni/cache.t b/t/uni/cache.t
index d6e621a..4520b7f 100644 (file)
--- a/t/uni/cache.t
+++ b/t/uni/cache.t
@@ -1,8 +1,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
     if (is_miniperl()) {
         skip_all_if_miniperl("Unicode tables not built yet")
             unless eval 'require "unicore/Heavy.pl"';

diff --git a/t/uni/class.t b/t/uni/class.t
index 01cb326..ec0a554 100644 (file)
--- a/t/uni/class.t
+++ b/t/uni/class.t
@@ -1,8 +1,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, qw(../lib .);
+    set_up_inc(qw(../lib .));
     if (is_miniperl()) {
         skip_all_if_miniperl("Unicode tables not built yet")
             unless eval 'require "unicore/Heavy.pl"';

diff --git a/t/uni/fold.t b/t/uni/fold.t
index 5eb39d3..66c4f01 100644 (file)
--- a/t/uni/fold.t
+++ b/t/uni/fold.t
@@ -7,8 +7,7 @@ use warnings;
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
     if (is_miniperl()) {
         skip_all_if_miniperl("Unicode tables not built yet")
             unless eval 'require "unicore/Heavy.pl"';

diff --git a/t/uni/gv.t b/t/uni/gv.t
index c63228c..45b21bb 100644 (file)
--- a/t/uni/gv.t
+++ b/t/uni/gv.t
@@ -7,8 +7,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
     if (is_miniperl()) {
         skip_all_if_miniperl("Unicode tables not built yet")
             unless eval 'require "unicore/Heavy.pl"';

diff --git a/t/uni/labels.t b/t/uni/labels.t
index ec80ade..a64595b 100644 (file)
--- a/t/uni/labels.t
+++ b/t/uni/labels.t
@@ -5,8 +5,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    @INC = () unless is_miniperl();
-    unshift @INC, '../lib';
+    set_up_inc('../lib');
     if (is_miniperl()) {
         skip_all_if_miniperl("Unicode tables not built yet")
             unless eval 'require "unicore/Heavy.pl"';

diff --git a/t/uni/lower.t b/t/uni/lower.t
index 518ce1f..62bd022 100644 (file)
--- a/t/uni/lower.t
+++ b/t/uni/lower.t
@@ -1,8 +1,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require "uni/case.pl";
-    @INC = () unless is_miniperl();
-    unshift @INC, qw(../lib .);
+    set_up_inc(qw(../lib .));
 }
 
 casetest(0, # No extra tests run here,

diff --git a/t/uni/title.t b/t/uni/title.t
index 4cd4090..e4c03c2 100644 (file)
--- a/t/uni/title.t
+++ b/t/uni/title.t
@@ -1,8 +1,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require "uni/case.pl";
-    @INC = () unless is_miniperl();
-    unshift @INC, qw(../lib .);
+    set_up_inc(qw(../lib .));
 }
 
 casetest(0, # No extra tests run here,

diff --git a/t/uni/upper.t b/t/uni/upper.t
index 0c31922..3267038 100644 (file)
--- a/t/uni/upper.t
+++ b/t/uni/upper.t
@@ -1,8 +1,7 @@
 BEGIN {
     chdir 't' if -d 't';
     require "uni/case.pl";
-    @INC = () unless is_miniperl();
-    unshift @INC, qw(../lib .);
+    set_up_inc(qw(../lib .));
 }
 
 is(uc("\x{3B1}\x{345}\x{301}"), "\x{391}\x{301}\x{399}", 'Verify moves YPOGEGRAMMENI');