From 20822f61cc01ab34be1e17db483aceb9d5ec8fb7 Mon Sep 17 00:00:00 2001 From: Mike Guy Date: Fri, 25 Aug 2000 16:15:59 +0100 Subject: [PATCH] Use minimal @INC in tests, most of the time just '../lib', so that we simply can't pick up stuff from other Perls than the one we are testing. Pointed out by Subject: Re: [PATCH: 6757] make new Storable tests forgiving of places where not built Message-Id: p4raw-id: //depot/perl@6874 --- t/base/term.t | 2 +- t/comp/bproto.t | 2 +- t/comp/colon.t | 2 +- t/comp/cpp.t | 2 +- t/comp/proto.t | 2 +- t/comp/require.t | 3 ++- t/comp/use.t | 2 +- t/io/argv.t | 2 +- t/io/fs.t | 2 +- t/io/open.t | 2 +- t/io/openpid.t | 2 +- t/io/pipe.t | 2 +- t/lib/abbrev.t | 2 +- t/lib/ansicolor.t | 2 +- t/lib/anydbm.t | 2 +- t/lib/attrs.t | 2 +- t/lib/autoloader.t | 3 ++- t/lib/b.t | 2 +- t/lib/basename.t | 2 +- t/lib/bigint.t | 2 +- t/lib/bigintpm.t | 2 +- t/lib/cgi-form.t | 2 +- t/lib/cgi-function.t | 2 +- t/lib/cgi-html.t | 2 +- t/lib/cgi-pretty.t | 2 +- t/lib/cgi-request.t | 2 +- t/lib/charnames.t | 2 +- t/lib/checktree.t | 2 +- t/lib/complex.t | 2 +- t/lib/db-btree.t | 2 +- t/lib/db-hash.t | 2 +- t/lib/db-recno.t | 2 +- t/lib/dirhand.t | 2 +- t/lib/dosglob.t | 2 +- t/lib/dprof.t | 2 +- t/lib/dumper-ovl.t | 2 +- t/lib/dumper.t | 2 +- t/lib/english.t | 2 +- t/lib/env-array.t | 2 +- t/lib/env.t | 2 +- t/lib/errno.t | 2 +- t/lib/fatal.t | 2 +- t/lib/fields.t | 2 +- t/lib/filecache.t | 2 +- t/lib/filecopy.t | 2 +- t/lib/filefind.t | 2 +- t/lib/filefunc.t | 2 +- t/lib/filehand.t | 2 +- t/lib/filepath.t | 2 +- t/lib/filespec.t | 2 +- t/lib/findbin.t | 2 +- t/lib/ftmp-mktemp.t | 2 +- t/lib/ftmp-posix.t | 2 +- t/lib/ftmp-security.t | 2 +- t/lib/ftmp-tempfile.t | 2 +- t/lib/gdbm.t | 2 +- t/lib/getopt.t | 2 +- t/lib/glob-basic.t | 2 +- t/lib/glob-case.t | 2 +- t/lib/glob-global.t | 2 +- t/lib/glob-taint.t | 2 +- t/lib/gol-basic.t | 2 +- t/lib/gol-compat.t | 2 +- t/lib/gol-linkage.t | 2 +- t/lib/gol-oo.t | 2 +- t/lib/h2ph.t | 2 +- t/lib/hostname.t | 2 +- t/lib/io_const.t | 2 +- t/lib/io_dir.t | 2 +- t/lib/io_dup.t | 2 +- t/lib/io_linenum.t | 2 +- t/lib/io_multihomed.t | 2 +- t/lib/io_pipe.t | 2 +- t/lib/io_poll.t | 2 +- t/lib/io_sel.t | 2 +- t/lib/io_sock.t | 2 +- t/lib/io_taint.t | 2 +- t/lib/io_tell.t | 2 +- t/lib/io_udp.t | 2 +- t/lib/io_unix.t | 2 +- t/lib/io_xs.t | 2 +- t/lib/ipc_sysv.t | 2 +- t/lib/ndbm.t | 2 +- t/lib/odbm.t | 2 +- t/lib/opcode.t | 2 +- t/lib/open2.t | 2 +- t/lib/open3.t | 2 +- t/lib/ops.t | 2 +- t/lib/parsewords.t | 2 +- t/lib/peek.t | 2 +- t/lib/ph.t | 2 +- t/lib/posix.t | 2 +- t/lib/safe1.t | 2 +- t/lib/safe2.t | 2 +- t/lib/sdbm.t | 2 +- t/lib/searchdict.t | 2 +- t/lib/selectsaver.t | 2 +- t/lib/selfloader.t | 3 ++- t/lib/socket.t | 2 +- t/lib/soundex.t | 2 +- t/lib/st-06compat.t | 3 ++- t/lib/st-blessed.t | 3 ++- t/lib/st-canonical.t | 3 ++- t/lib/st-dclone.t | 3 ++- t/lib/st-forgive.t | 3 ++- t/lib/st-freeze.t | 3 ++- t/lib/st-overload.t | 3 ++- t/lib/st-recurse.t | 3 ++- t/lib/st-retrieve.t | 3 ++- t/lib/st-store.t | 3 ++- t/lib/st-tied.t | 3 ++- t/lib/st-tiedhook.t | 3 ++- t/lib/st-tieditems.t | 3 ++- t/lib/symbol.t | 2 +- t/lib/syslfs.t | 2 +- t/lib/syslog.t | 2 +- t/lib/textfill.t | 2 +- t/lib/texttabs.t | 2 +- t/lib/textwrap.t | 2 +- t/lib/thr5005.t | 2 +- t/lib/tie-push.t | 3 ++- t/lib/tie-stdarray.t | 3 ++- t/lib/tie-stdhandle.t | 2 +- t/lib/tie-stdpush.t | 3 ++- t/lib/timelocal.t | 2 +- t/lib/trig.t | 2 +- t/op/64bitint.t | 2 +- t/op/assignwarn.t | 2 +- t/op/attrs.t | 2 +- t/op/avhv.t | 2 +- t/op/bless.t | 2 +- t/op/bop.t | 2 +- t/op/closure.t | 2 +- t/op/defins.t | 2 +- t/op/die_exit.t | 2 +- t/op/exists_sub.t | 2 +- t/op/filetest.t | 2 +- t/op/fork.t | 2 +- t/op/glob.t | 2 +- t/op/goto_xs.t | 2 +- t/op/grent.t | 2 +- t/op/gv.t | 2 +- t/op/hashwarn.t | 2 +- t/op/int.t | 2 +- t/op/lex_assign.t | 2 +- t/op/lfs.t | 2 +- t/op/lop.t | 2 +- t/op/magic.t | 2 +- t/op/method.t | 2 +- t/op/misc.t | 2 +- t/op/mkdir.t | 2 +- t/op/my_stash.t | 2 +- t/op/nothr5005.t | 2 +- t/op/pack.t | 2 +- t/op/pat.t | 2 +- t/op/pwent.t | 2 +- t/op/quotemeta.t | 2 +- t/op/rand.t | 2 +- t/op/readdir.t | 2 +- t/op/regexp.t | 2 +- t/op/regmesg.t | 2 +- t/op/runlevel.t | 2 +- t/op/sort.t | 2 +- t/op/sprintf.t | 2 +- t/op/stat.t | 2 +- t/op/subst.t | 2 +- t/op/subst_amp.t | 2 +- t/op/substr.t | 2 +- t/op/taint.t | 2 +- t/op/tie.t | 2 +- t/op/tiearray.t | 2 +- t/op/tiehandle.t | 2 +- t/op/tr.t | 2 +- t/op/undef.t | 2 +- t/op/universal.t | 2 +- t/op/ver.t | 2 +- t/pragma/constant.t | 2 +- t/pragma/diagnostics.t | 4 ++-- t/pragma/locale.t | 2 +- t/pragma/overload.t | 2 +- t/pragma/strict.t | 2 +- t/pragma/sub_lval.t | 2 +- t/pragma/subs.t | 2 +- t/pragma/utf8.t | 2 +- t/pragma/warnings.t | 2 +- 185 files changed, 205 insertions(+), 186 deletions(-) diff --git a/t/base/term.t b/t/base/term.t index 6380694..e96313d 100755 --- a/t/base/term.t +++ b/t/base/term.t @@ -4,7 +4,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use Config; diff --git a/t/comp/bproto.t b/t/comp/bproto.t index 01efb84..70748be 100755 --- a/t/comp/bproto.t +++ b/t/comp/bproto.t @@ -5,7 +5,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } print "1..10\n"; diff --git a/t/comp/colon.t b/t/comp/colon.t index dee5330..d2c64fe 100755 --- a/t/comp/colon.t +++ b/t/comp/colon.t @@ -9,7 +9,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use strict; diff --git a/t/comp/cpp.t b/t/comp/cpp.t index bbff38c..5b061ee 100755 --- a/t/comp/cpp.t +++ b/t/comp/cpp.t @@ -4,7 +4,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use Config; diff --git a/t/comp/proto.t b/t/comp/proto.t index a77db9b..f9731ee 100755 --- a/t/comp/proto.t +++ b/t/comp/proto.t @@ -11,7 +11,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use strict; diff --git a/t/comp/require.t b/t/comp/require.t index bfd4a37..eaea3ad 100755 --- a/t/comp/require.t +++ b/t/comp/require.t @@ -2,7 +2,8 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, ('.', '../lib'); + @INC = '.'; + push @INC, '../lib'; } # don't make this lexical diff --git a/t/comp/use.t b/t/comp/use.t index 1f5fae3..fb59777 100755 --- a/t/comp/use.t +++ b/t/comp/use.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } print "1..27\n"; diff --git a/t/io/argv.t b/t/io/argv.t index 2595fa6..2b8f23b 100755 --- a/t/io/argv.t +++ b/t/io/argv.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } print "1..21\n"; diff --git a/t/io/fs.t b/t/io/fs.t index 970e2f3..7182c24 100755 --- a/t/io/fs.t +++ b/t/io/fs.t @@ -4,7 +4,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use Config; diff --git a/t/io/open.t b/t/io/open.t index 30db598..b224cce 100755 --- a/t/io/open.t +++ b/t/io/open.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } # $RCSfile$ diff --git a/t/io/openpid.t b/t/io/openpid.t index 80c6bde..d8326d8 100755 --- a/t/io/openpid.t +++ b/t/io/openpid.t @@ -9,7 +9,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; if ($^O eq 'dos') { print "1..0 # Skip: no multitasking\n"; exit 0; diff --git a/t/io/pipe.t b/t/io/pipe.t index 4559624..96935e3 100755 --- a/t/io/pipe.t +++ b/t/io/pipe.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; unless ($Config{'d_fork'}) { print "1..0 # Skip: no fork\n"; diff --git a/t/lib/abbrev.t b/t/lib/abbrev.t index 05e5c70..fb5a984 100755 --- a/t/lib/abbrev.t +++ b/t/lib/abbrev.t @@ -4,7 +4,7 @@ print "1..7\n"; BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use Text::Abbrev; diff --git a/t/lib/ansicolor.t b/t/lib/ansicolor.t index b1efb6a..f38e905 100755 --- a/t/lib/ansicolor.t +++ b/t/lib/ansicolor.t @@ -1,6 +1,6 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } # Test suite for the Term::ANSIColor Perl module. Before `make install' is diff --git a/t/lib/anydbm.t b/t/lib/anydbm.t index e304766..40c4366 100755 --- a/t/lib/anydbm.t +++ b/t/lib/anydbm.t @@ -4,7 +4,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; if (($Config{'extensions'} !~ /\b(DB|[A-Z]DBM)_File\b/) ){ print "1..0 # Skipping (no DB_File or [A-Z]DBM_File)\n"; diff --git a/t/lib/attrs.t b/t/lib/attrs.t index eb8c8c4..440122c 100644 --- a/t/lib/attrs.t +++ b/t/lib/attrs.t @@ -4,7 +4,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; eval 'require attrs; 1' or do { print "1..0\n"; exit 0; diff --git a/t/lib/autoloader.t b/t/lib/autoloader.t index 3bf690b..b53b9feea 100755 --- a/t/lib/autoloader.t +++ b/t/lib/autoloader.t @@ -3,7 +3,8 @@ BEGIN { chdir 't' if -d 't'; $dir = "auto-$$"; - unshift @INC, ("./$dir", "../lib"); + @INC = $dir; + push @INC, '../lib'; } print "1..11\n"; diff --git a/t/lib/b.t b/t/lib/b.t index f562e15..aabfc0d 100755 --- a/t/lib/b.t +++ b/t/lib/b.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } $| = 1; diff --git a/t/lib/basename.t b/t/lib/basename.t index 478e26a..a02aa32 100755 --- a/t/lib/basename.t +++ b/t/lib/basename.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use File::Basename qw(fileparse basename dirname); diff --git a/t/lib/bigint.t b/t/lib/bigint.t index d2d520e..034c5c6 100755 --- a/t/lib/bigint.t +++ b/t/lib/bigint.t @@ -1,6 +1,6 @@ #!./perl -BEGIN { unshift @INC, '../lib' } +BEGIN { @INC = '../lib' } require "bigint.pl"; $test = 0; diff --git a/t/lib/bigintpm.t b/t/lib/bigintpm.t index ae362e2..e76f246 100755 --- a/t/lib/bigintpm.t +++ b/t/lib/bigintpm.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use Math::BigInt; diff --git a/t/lib/cgi-form.t b/t/lib/cgi-form.t index 6bfb76a..7d02181 100755 --- a/t/lib/cgi-form.t +++ b/t/lib/cgi-form.t @@ -2,7 +2,7 @@ BEGIN { chdir('t') if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } # Test ability to retrieve HTTP request info diff --git a/t/lib/cgi-function.t b/t/lib/cgi-function.t index 234bb9e..653c4e5 100755 --- a/t/lib/cgi-function.t +++ b/t/lib/cgi-function.t @@ -2,7 +2,7 @@ BEGIN { chdir('t') if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } # Test ability to retrieve HTTP request info diff --git a/t/lib/cgi-html.t b/t/lib/cgi-html.t index 6cfb10b..2d71ff6 100755 --- a/t/lib/cgi-html.t +++ b/t/lib/cgi-html.t @@ -2,7 +2,7 @@ BEGIN { chdir('t') if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } # Test ability to retrieve HTTP request info diff --git a/t/lib/cgi-pretty.t b/t/lib/cgi-pretty.t index 65b4722..14f6447 100755 --- a/t/lib/cgi-pretty.t +++ b/t/lib/cgi-pretty.t @@ -2,7 +2,7 @@ BEGIN { chdir('t') if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } # Test ability to retrieve HTTP request info diff --git a/t/lib/cgi-request.t b/t/lib/cgi-request.t index 3482f1c..fde3fd0 100755 --- a/t/lib/cgi-request.t +++ b/t/lib/cgi-request.t @@ -2,7 +2,7 @@ BEGIN { chdir('t') if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } # Test ability to retrieve HTTP request info diff --git a/t/lib/charnames.t b/t/lib/charnames.t index 2e6a818..1d08ad0 100644 --- a/t/lib/charnames.t +++ b/t/lib/charnames.t @@ -3,7 +3,7 @@ BEGIN { unless(grep /blib/, @INC) { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; } } diff --git a/t/lib/checktree.t b/t/lib/checktree.t index 7603575..b5426ca 100755 --- a/t/lib/checktree.t +++ b/t/lib/checktree.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } print "1..1\n"; diff --git a/t/lib/complex.t b/t/lib/complex.t index 43dad7f..334374d 100755 --- a/t/lib/complex.t +++ b/t/lib/complex.t @@ -9,7 +9,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use Math::Complex; diff --git a/t/lib/db-btree.t b/t/lib/db-btree.t index b13e50e..75c661b 100755 --- a/t/lib/db-btree.t +++ b/t/lib/db-btree.t @@ -1,7 +1,7 @@ #!./perl -w BEGIN { - unshift @INC, '../lib' if -d '../lib' ; + @INC = '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bDB_File\b/) { print "1..0 # Skip: DB_File was not built\n"; diff --git a/t/lib/db-hash.t b/t/lib/db-hash.t index c52d8ae..b701874 100755 --- a/t/lib/db-hash.t +++ b/t/lib/db-hash.t @@ -1,7 +1,7 @@ #!./perl -w BEGIN { - unshift @INC, '../lib' if -d '../lib' ; + @INC = '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bDB_File\b/) { print "1..0 # Skip: DB_File was not built\n"; diff --git a/t/lib/db-recno.t b/t/lib/db-recno.t index 276f38b..18fb45b 100755 --- a/t/lib/db-recno.t +++ b/t/lib/db-recno.t @@ -1,7 +1,7 @@ #!./perl -w BEGIN { - unshift @INC, '../lib' if -d '../lib' ; + @INC = '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bDB_File\b/) { print "1..0 # Skip: DB_File was not built\n"; diff --git a/t/lib/dirhand.t b/t/lib/dirhand.t index a8683c7..aa7be35 100755 --- a/t/lib/dirhand.t +++ b/t/lib/dirhand.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; if (not $Config{'d_readdir'}) { print "1..0\n"; diff --git a/t/lib/dosglob.t b/t/lib/dosglob.t index 91aa6cc..fd9bb1d 100755 --- a/t/lib/dosglob.t +++ b/t/lib/dosglob.t @@ -6,7 +6,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } print "1..10\n"; diff --git a/t/lib/dprof.t b/t/lib/dprof.t index fc5bd05..10c9b0f 100755 --- a/t/lib/dprof.t +++ b/t/lib/dprof.t @@ -2,7 +2,7 @@ BEGIN { chdir( 't' ) if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bDevel\/DProf\b/){ print "1..0 # Skip: Devel::DProf was not built\n"; diff --git a/t/lib/dumper-ovl.t b/t/lib/dumper-ovl.t index b8c8719..d4b3a92 100755 --- a/t/lib/dumper-ovl.t +++ b/t/lib/dumper-ovl.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bData\/Dumper\b/) { print "1..0 # Skip: Data::Dumper was not built\n"; diff --git a/t/lib/dumper.t b/t/lib/dumper.t index 7b5a611..183442d 100755 --- a/t/lib/dumper.t +++ b/t/lib/dumper.t @@ -5,7 +5,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bData\/Dumper\b/) { print "1..0 # Skip: Data::Dumper was not built\n"; diff --git a/t/lib/english.t b/t/lib/english.t index 6438d13..459dc3b 100755 --- a/t/lib/english.t +++ b/t/lib/english.t @@ -2,7 +2,7 @@ print "1..22\n"; -BEGIN { unshift @INC, '../lib' } +BEGIN { @INC = '../lib' } use English qw( -no_match_vars ) ; use Config; my $threads = $Config{'use5005threads'} || 0; diff --git a/t/lib/env-array.t b/t/lib/env-array.t index d90d892..c5068fd 100755 --- a/t/lib/env-array.t +++ b/t/lib/env-array.t @@ -4,7 +4,7 @@ $| = 1; BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } if ($^O eq 'VMS') { diff --git a/t/lib/env.t b/t/lib/env.t index 2573164..ff6af2e 100755 --- a/t/lib/env.t +++ b/t/lib/env.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } BEGIN { diff --git a/t/lib/errno.t b/t/lib/errno.t index 6320f6b..d173cd9 100755 --- a/t/lib/errno.t +++ b/t/lib/errno.t @@ -3,7 +3,7 @@ BEGIN { unless(grep /blib/, @INC) { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; } } diff --git a/t/lib/fatal.t b/t/lib/fatal.t index 4013fbd..f00b876 100755 --- a/t/lib/fatal.t +++ b/t/lib/fatal.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; print "1..15\n"; } diff --git a/t/lib/fields.t b/t/lib/fields.t index 7709ee5..a3f591a 100755 --- a/t/lib/fields.t +++ b/t/lib/fields.t @@ -4,7 +4,7 @@ my $w; BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; $SIG{__WARN__} = sub { if ($_[0] =~ /^Hides field 'b1' in base class/) { $w++; diff --git a/t/lib/filecache.t b/t/lib/filecache.t index 019f374..a97fdd5 100755 --- a/t/lib/filecache.t +++ b/t/lib/filecache.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } print "1..1\n"; diff --git a/t/lib/filecopy.t b/t/lib/filecopy.t index b6fcbea..3072c54 100755 --- a/t/lib/filecopy.t +++ b/t/lib/filecopy.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } $| = 1; diff --git a/t/lib/filefind.t b/t/lib/filefind.t index ca12e74..362c1eb 100755 --- a/t/lib/filefind.t +++ b/t/lib/filefind.t @@ -6,7 +6,7 @@ my $symlink_exists = eval { symlink("",""); 1 }; BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } if ( $symlink_exists ) { print "1..117\n"; } diff --git a/t/lib/filefunc.t b/t/lib/filefunc.t index 46a1e35..9268122 100755 --- a/t/lib/filefunc.t +++ b/t/lib/filefunc.t @@ -3,7 +3,7 @@ BEGIN { $^O = ''; chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } print "1..1\n"; diff --git a/t/lib/filehand.t b/t/lib/filehand.t index 22cff0e..827410a 100755 --- a/t/lib/filehand.t +++ b/t/lib/filehand.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bIO\b/ && $^O ne 'VMS') { print "1..0\n"; diff --git a/t/lib/filepath.t b/t/lib/filepath.t index 5628d0c..42e0ae9 100755 --- a/t/lib/filepath.t +++ b/t/lib/filepath.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use File::Path; diff --git a/t/lib/filespec.t b/t/lib/filespec.t index da52ec5..c6d155f 100755 --- a/t/lib/filespec.t +++ b/t/lib/filespec.t @@ -3,7 +3,7 @@ BEGIN { $^O = ''; chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } # Each element in this array is a single test. Storing them this way makes diff --git a/t/lib/findbin.t b/t/lib/findbin.t index f0939e9..3e742f9 100755 --- a/t/lib/findbin.t +++ b/t/lib/findbin.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } print "1..1\n"; diff --git a/t/lib/ftmp-mktemp.t b/t/lib/ftmp-mktemp.t index 35ab59c..9503ea7 100755 --- a/t/lib/ftmp-mktemp.t +++ b/t/lib/ftmp-mktemp.t @@ -5,7 +5,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Test; import Test; plan(tests => 9); } diff --git a/t/lib/ftmp-posix.t b/t/lib/ftmp-posix.t index 8c9fd55..2e45586 100755 --- a/t/lib/ftmp-posix.t +++ b/t/lib/ftmp-posix.t @@ -3,7 +3,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Test; import Test; plan(tests => 7); } diff --git a/t/lib/ftmp-security.t b/t/lib/ftmp-security.t index 761cbc1..4efe5e5 100755 --- a/t/lib/ftmp-security.t +++ b/t/lib/ftmp-security.t @@ -7,7 +7,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Test; import Test; plan(tests => 13); } diff --git a/t/lib/ftmp-tempfile.t b/t/lib/ftmp-tempfile.t index 4811007..48a52b3 100755 --- a/t/lib/ftmp-tempfile.t +++ b/t/lib/ftmp-tempfile.t @@ -3,7 +3,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Test; import Test; plan(tests => 16); } diff --git a/t/lib/gdbm.t b/t/lib/gdbm.t index dc4e96e..54f5994 100755 --- a/t/lib/gdbm.t +++ b/t/lib/gdbm.t @@ -3,7 +3,7 @@ # $RCSfile: dbm.t,v $$Revision: 4.1 $$Date: 92/08/07 18:27:43 $ BEGIN { - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bGDBM_File\b/) { print "1..0 # Skip: GDBM_File was not built\n"; diff --git a/t/lib/getopt.t b/t/lib/getopt.t index 0354627..fb70f10 100755 --- a/t/lib/getopt.t +++ b/t/lib/getopt.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } print "1..11\n"; diff --git a/t/lib/glob-basic.t b/t/lib/glob-basic.t index cbb1263..e8a2905 100755 --- a/t/lib/glob-basic.t +++ b/t/lib/glob-basic.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bFile\/Glob\b/i) { print "1..0\n"; diff --git a/t/lib/glob-case.t b/t/lib/glob-case.t index 3d5c816..56d35f3 100755 --- a/t/lib/glob-case.t +++ b/t/lib/glob-case.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bFile\/Glob\b/i) { print "1..0\n"; diff --git a/t/lib/glob-global.t b/t/lib/glob-global.t index 0045f89..a82408c 100755 --- a/t/lib/glob-global.t +++ b/t/lib/glob-global.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bFile\/Glob\b/i) { print "1..0\n"; diff --git a/t/lib/glob-taint.t b/t/lib/glob-taint.t index 586357f..fe2fa23 100755 --- a/t/lib/glob-taint.t +++ b/t/lib/glob-taint.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bFile\/Glob\b/i) { print "1..0\n"; diff --git a/t/lib/gol-basic.t b/t/lib/gol-basic.t index 0443816..351bbc8 100755 --- a/t/lib/gol-basic.t +++ b/t/lib/gol-basic.t @@ -2,7 +2,7 @@ BEGIN { chdir('t') if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use Getopt::Long qw(:config no_ignore_case); diff --git a/t/lib/gol-compat.t b/t/lib/gol-compat.t index 2f566b0..0bbe386 100755 --- a/t/lib/gol-compat.t +++ b/t/lib/gol-compat.t @@ -2,7 +2,7 @@ BEGIN { chdir('t') if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } require "newgetopt.pl"; diff --git a/t/lib/gol-linkage.t b/t/lib/gol-linkage.t index 69fc73b..3bd81a3 100755 --- a/t/lib/gol-linkage.t +++ b/t/lib/gol-linkage.t @@ -2,7 +2,7 @@ BEGIN { chdir('t') if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use Getopt::Long; diff --git a/t/lib/gol-oo.t b/t/lib/gol-oo.t index b344e4c..ff1cd2e 100644 --- a/t/lib/gol-oo.t +++ b/t/lib/gol-oo.t @@ -2,7 +2,7 @@ BEGIN { chdir('t') if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use Getopt::Long; diff --git a/t/lib/h2ph.t b/t/lib/h2ph.t index acb150d..15dc2b5 100755 --- a/t/lib/h2ph.t +++ b/t/lib/h2ph.t @@ -5,7 +5,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } print "1..2\n"; diff --git a/t/lib/hostname.t b/t/lib/hostname.t index 8a34e9c..85a04cd 100755 --- a/t/lib/hostname.t +++ b/t/lib/hostname.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bSys\/Hostname\b/) { print "1..0 # Skip: Sys::Hostname was not built\n"; diff --git a/t/lib/io_const.t b/t/lib/io_const.t index 48cb6b5..db1a322 100755 --- a/t/lib/io_const.t +++ b/t/lib/io_const.t @@ -2,7 +2,7 @@ BEGIN { unless(grep /blib/, @INC) { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; } } diff --git a/t/lib/io_dir.t b/t/lib/io_dir.t index 11ec8bc..3689871 100755 --- a/t/lib/io_dir.t +++ b/t/lib/io_dir.t @@ -3,7 +3,7 @@ BEGIN { unless(grep /blib/, @INC) { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; } require Config; import Config; if ($] < 5.00326 || not $Config{'d_readdir'}) { diff --git a/t/lib/io_dup.t b/t/lib/io_dup.t index c895fb4..0f17264 100755 --- a/t/lib/io_dup.t +++ b/t/lib/io_dup.t @@ -3,7 +3,7 @@ BEGIN { unless(grep /blib/, @INC) { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; } } diff --git a/t/lib/io_linenum.t b/t/lib/io_linenum.t index 3503215..cf55c98 100755 --- a/t/lib/io_linenum.t +++ b/t/lib/io_linenum.t @@ -13,7 +13,7 @@ BEGIN chdir 't'; $File =~ s/^t\W+//; # Remove first directory } - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; require strict; import strict; } diff --git a/t/lib/io_multihomed.t b/t/lib/io_multihomed.t index 7337a5f..55030b5 100644 --- a/t/lib/io_multihomed.t +++ b/t/lib/io_multihomed.t @@ -3,7 +3,7 @@ BEGIN { unless(grep /blib/, @INC) { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; } } diff --git a/t/lib/io_pipe.t b/t/lib/io_pipe.t index bcb89a0..ae18224 100755 --- a/t/lib/io_pipe.t +++ b/t/lib/io_pipe.t @@ -3,7 +3,7 @@ BEGIN { unless(grep /blib/, @INC) { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; } } diff --git a/t/lib/io_poll.t b/t/lib/io_poll.t index 925830e..d391566 100755 --- a/t/lib/io_poll.t +++ b/t/lib/io_poll.t @@ -3,7 +3,7 @@ BEGIN { unless(grep /blib/, @INC) { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; } } diff --git a/t/lib/io_sel.t b/t/lib/io_sel.t index 85e14ab..5d1dce3 100755 --- a/t/lib/io_sel.t +++ b/t/lib/io_sel.t @@ -3,7 +3,7 @@ BEGIN { unless(grep /blib/, @INC) { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; } } diff --git a/t/lib/io_sock.t b/t/lib/io_sock.t index 056d131..5a8e16c 100755 --- a/t/lib/io_sock.t +++ b/t/lib/io_sock.t @@ -3,7 +3,7 @@ BEGIN { unless(grep /blib/, @INC) { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; } } diff --git a/t/lib/io_taint.t b/t/lib/io_taint.t index deaa6c7..19afa2f 100755 --- a/t/lib/io_taint.t +++ b/t/lib/io_taint.t @@ -3,7 +3,7 @@ BEGIN { unless(grep /blib/, @INC) { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; } } diff --git a/t/lib/io_tell.t b/t/lib/io_tell.t index 8d75242..3aa4b03 100755 --- a/t/lib/io_tell.t +++ b/t/lib/io_tell.t @@ -3,7 +3,7 @@ BEGIN { unless(grep /blib/, @INC) { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; $tell_file = "TEST"; } else { diff --git a/t/lib/io_udp.t b/t/lib/io_udp.t index 3d5145e..9df62cf 100755 --- a/t/lib/io_udp.t +++ b/t/lib/io_udp.t @@ -3,7 +3,7 @@ BEGIN { unless(grep /blib/, @INC) { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; } } diff --git a/t/lib/io_unix.t b/t/lib/io_unix.t index 247647a..2f6def0 100644 --- a/t/lib/io_unix.t +++ b/t/lib/io_unix.t @@ -3,7 +3,7 @@ BEGIN { unless(grep /blib/, @INC) { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; } } diff --git a/t/lib/io_xs.t b/t/lib/io_xs.t index 6bbba16..9305c31 100755 --- a/t/lib/io_xs.t +++ b/t/lib/io_xs.t @@ -3,7 +3,7 @@ BEGIN { unless(grep /blib/, @INC) { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; } } diff --git a/t/lib/ipc_sysv.t b/t/lib/ipc_sysv.t index d2991e3..795ad5d 100755 --- a/t/lib/ipc_sysv.t +++ b/t/lib/ipc_sysv.t @@ -3,7 +3,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; diff --git a/t/lib/ndbm.t b/t/lib/ndbm.t index 39c3f40..4937a8c 100755 --- a/t/lib/ndbm.t +++ b/t/lib/ndbm.t @@ -4,7 +4,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bNDBM_File\b/) { print "1..0 # Skip: NDBM_File was not built\n"; diff --git a/t/lib/odbm.t b/t/lib/odbm.t index f8b8a11..ccd3e60 100755 --- a/t/lib/odbm.t +++ b/t/lib/odbm.t @@ -4,7 +4,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bODBM_File\b/) { print "1..0 # Skip: ODBM_File was not built\n"; diff --git a/t/lib/opcode.t b/t/lib/opcode.t index f83a689..a785fce 100755 --- a/t/lib/opcode.t +++ b/t/lib/opcode.t @@ -4,7 +4,7 @@ $|=1; BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bOpcode\b/ && $Config{'osname'} ne 'VMS') { print "1..0\n"; diff --git a/t/lib/open2.t b/t/lib/open2.t index 6443112..85b807c 100755 --- a/t/lib/open2.t +++ b/t/lib/open2.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; if (!$Config{'d_fork'} # open2/3 supported on win32 (but not Borland due to CRT bugs) diff --git a/t/lib/open3.t b/t/lib/open3.t index bf042bf..a0da34f 100755 --- a/t/lib/open3.t +++ b/t/lib/open3.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; if (!$Config{'d_fork'} # open2/3 supported on win32 (but not Borland due to CRT bugs) diff --git a/t/lib/ops.t b/t/lib/ops.t index ce8b6d0..56b1bac 100755 --- a/t/lib/ops.t +++ b/t/lib/ops.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bOpcode\b/ && $Config{'osname'} ne 'VMS') { print "1..0\n"; diff --git a/t/lib/parsewords.t b/t/lib/parsewords.t index 2c936f1..261d81f 100755 --- a/t/lib/parsewords.t +++ b/t/lib/parsewords.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use warnings; diff --git a/t/lib/peek.t b/t/lib/peek.t index 7eed46d..597d11d 100644 --- a/t/lib/peek.t +++ b/t/lib/peek.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bPeek\b/) { print "1..0 # Skip: Devel::Peek was not built\n"; diff --git a/t/lib/ph.t b/t/lib/ph.t index dd24c79..de27dee 100755 --- a/t/lib/ph.t +++ b/t/lib/ph.t @@ -6,7 +6,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } # All the constants which Socket.pm tries to make available: diff --git a/t/lib/posix.t b/t/lib/posix.t index d38e7ef..994704a 100755 --- a/t/lib/posix.t +++ b/t/lib/posix.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; if ($^O ne 'VMS' and $Config{'extensions'} !~ /\bPOSIX\b/) { print "1..0\n"; diff --git a/t/lib/safe1.t b/t/lib/safe1.t index 6e12873..27993d9 100755 --- a/t/lib/safe1.t +++ b/t/lib/safe1.t @@ -2,7 +2,7 @@ $|=1; BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bOpcode\b/ && $Config{'osname'} ne 'VMS') { print "1..0\n"; diff --git a/t/lib/safe2.t b/t/lib/safe2.t index 293b515..4d6c84a 100755 --- a/t/lib/safe2.t +++ b/t/lib/safe2.t @@ -2,7 +2,7 @@ $|=1; BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bOpcode\b/ && $Config{'osname'} ne 'VMS') { print "1..0\n"; diff --git a/t/lib/sdbm.t b/t/lib/sdbm.t index 2689d19..b6a1a69 100755 --- a/t/lib/sdbm.t +++ b/t/lib/sdbm.t @@ -4,7 +4,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; if (($Config{'extensions'} !~ /\bSDBM_File\b/) && ($^O ne 'VMS')){ print "1..0\n"; diff --git a/t/lib/searchdict.t b/t/lib/searchdict.t index 46cea39..c36fdb8 100755 --- a/t/lib/searchdict.t +++ b/t/lib/searchdict.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } print "1..4\n"; diff --git a/t/lib/selectsaver.t b/t/lib/selectsaver.t index 677caec..3b58d70 100755 --- a/t/lib/selectsaver.t +++ b/t/lib/selectsaver.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } print "1..3\n"; diff --git a/t/lib/selfloader.t b/t/lib/selfloader.t index 75d6561..6b9c244 100755 --- a/t/lib/selfloader.t +++ b/t/lib/selfloader.t @@ -3,7 +3,8 @@ BEGIN { chdir 't' if -d 't'; $dir = "self-$$"; - unshift @INC, ("./$dir", "../lib"); + @INC = $dir; + push @INC, '../lib'; print "1..19\n"; diff --git a/t/lib/socket.t b/t/lib/socket.t index d5e1848..7017a54 100755 --- a/t/lib/socket.t +++ b/t/lib/socket.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bSocket\b/ && !(($^O eq 'VMS') && $Config{d_socket})) { diff --git a/t/lib/soundex.t b/t/lib/soundex.t index a04cccd..d35f264 100755 --- a/t/lib/soundex.t +++ b/t/lib/soundex.t @@ -18,7 +18,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use Text::Soundex; diff --git a/t/lib/st-06compat.t b/t/lib/st-06compat.t index 6ae0641..82c04f7 100644 --- a/t/lib/st-06compat.t +++ b/t/lib/st-06compat.t @@ -14,7 +14,8 @@ BEGIN { chdir('t') if -d 't'; - unshift @INC, '../lib'; + @INC = '.'; + push @INC, '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bStorable\b/) { print "1..0 # Skip: Storable was not built\n"; diff --git a/t/lib/st-blessed.t b/t/lib/st-blessed.t index d0296cb..284df4d 100644 --- a/t/lib/st-blessed.t +++ b/t/lib/st-blessed.t @@ -14,7 +14,8 @@ sub BEGIN { chdir('t') if -d 't'; - unshift @INC, '../lib'; + @INC = '.'; + push @INC, '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bStorable\b/) { print "1..0 # Skip: Storable was not built\n"; diff --git a/t/lib/st-canonical.t b/t/lib/st-canonical.t index 3eeed14..75abb84 100644 --- a/t/lib/st-canonical.t +++ b/t/lib/st-canonical.t @@ -14,7 +14,8 @@ sub BEGIN { chdir('t') if -d 't'; - unshift @INC, '../lib'; + @INC = '.'; + push @INC, '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bStorable\b/) { print "1..0 # Skip: Storable was not built\n"; diff --git a/t/lib/st-dclone.t b/t/lib/st-dclone.t index 01ba551..231b70f 100644 --- a/t/lib/st-dclone.t +++ b/t/lib/st-dclone.t @@ -14,7 +14,8 @@ sub BEGIN { chdir('t') if -d 't'; - unshift @INC, '../lib'; + @INC = '.'; + push @INC, '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bStorable\b/) { print "1..0 # Skip: Storable was not built\n"; diff --git a/t/lib/st-forgive.t b/t/lib/st-forgive.t index 822013b..e707b3e 100644 --- a/t/lib/st-forgive.t +++ b/t/lib/st-forgive.t @@ -20,7 +20,8 @@ sub BEGIN { chdir('t') if -d 't'; - unshift @INC, '../lib'; + @INC = '.'; + push @INC, '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bStorable\b/) { print "1..0 # Skip: Storable was not built\n"; diff --git a/t/lib/st-freeze.t b/t/lib/st-freeze.t index 8dde28f..0b2d1bc 100644 --- a/t/lib/st-freeze.t +++ b/t/lib/st-freeze.t @@ -14,7 +14,8 @@ sub BEGIN { chdir('t') if -d 't'; - unshift @INC, '../lib'; + @INC = '.'; + push @INC, '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bStorable\b/) { print "1..0 # Skip: Storable was not built\n"; diff --git a/t/lib/st-overload.t b/t/lib/st-overload.t index cb6a83e..6083faf 100644 --- a/t/lib/st-overload.t +++ b/t/lib/st-overload.t @@ -14,7 +14,8 @@ sub BEGIN { chdir('t') if -d 't'; - unshift @INC, '../lib'; + @INC = '.'; + push @INC, '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bStorable\b/) { print "1..0 # Skip: Storable was not built\n"; diff --git a/t/lib/st-recurse.t b/t/lib/st-recurse.t index ebaeba7..0cec4ee 100644 --- a/t/lib/st-recurse.t +++ b/t/lib/st-recurse.t @@ -14,7 +14,8 @@ sub BEGIN { chdir('t') if -d 't'; - unshift @INC, '../lib'; + @INC = '.'; + push @INC, '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bStorable\b/) { print "1..0 # Skip: Storable was not built\n"; diff --git a/t/lib/st-retrieve.t b/t/lib/st-retrieve.t index 2aec8f5..ee5c5a4 100644 --- a/t/lib/st-retrieve.t +++ b/t/lib/st-retrieve.t @@ -14,7 +14,8 @@ sub BEGIN { chdir('t') if -d 't'; - unshift @INC, '../lib'; + @INC = '.'; + push @INC, '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bStorable\b/) { print "1..0 # Skip: Storable was not built\n"; diff --git a/t/lib/st-store.t b/t/lib/st-store.t index dd14617..9966143 100644 --- a/t/lib/st-store.t +++ b/t/lib/st-store.t @@ -14,7 +14,8 @@ sub BEGIN { chdir('t') if -d 't'; - unshift @INC, '../lib'; + @INC = '.'; + push @INC, '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bStorable\b/) { print "1..0 # Skip: Storable was not built\n"; diff --git a/t/lib/st-tied.t b/t/lib/st-tied.t index dc6f81c..0abbac4 100644 --- a/t/lib/st-tied.t +++ b/t/lib/st-tied.t @@ -17,7 +17,8 @@ sub BEGIN { chdir('t') if -d 't'; - unshift @INC, '../lib'; + @INC = '.'; + push @INC, '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bStorable\b/) { print "1..0 # Skip: Storable was not built\n"; diff --git a/t/lib/st-tiedhook.t b/t/lib/st-tiedhook.t index a32a50d..a8a8158 100644 --- a/t/lib/st-tiedhook.t +++ b/t/lib/st-tiedhook.t @@ -14,7 +14,8 @@ sub BEGIN { chdir('t') if -d 't'; - unshift @INC, '../lib'; + @INC = '.'; + push @INC, '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bStorable\b/) { print "1..0 # Skip: Storable was not built\n"; diff --git a/t/lib/st-tieditems.t b/t/lib/st-tieditems.t index 3e32927..44e4f5c 100644 --- a/t/lib/st-tieditems.t +++ b/t/lib/st-tieditems.t @@ -21,7 +21,8 @@ sub BEGIN { chdir('t') if -d 't'; - unshift @INC, '../lib'; + @INC = '.'; + push @INC, '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bStorable\b/) { print "1..0 # Skip: Storable was not built\n"; diff --git a/t/lib/symbol.t b/t/lib/symbol.t index 14c919c..03449a3 100755 --- a/t/lib/symbol.t +++ b/t/lib/symbol.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } print "1..8\n"; diff --git a/t/lib/syslfs.t b/t/lib/syslfs.t index 3cfe302..96625f2 100644 --- a/t/lib/syslfs.t +++ b/t/lib/syslfs.t @@ -4,7 +4,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; # Don't bother if there are no quad offsets. if ($Config{lseeksize} < 8) { diff --git a/t/lib/syslog.t b/t/lib/syslog.t index e1927bc..7ad4204 100755 --- a/t/lib/syslog.t +++ b/t/lib/syslog.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; if ($Config{'extensions'} !~ /\bSyslog\b/) { print "1..0 # Skip: Sys::Syslog was not built\n"; diff --git a/t/lib/textfill.t b/t/lib/textfill.t index daeee23..5ff3850 100755 --- a/t/lib/textfill.t +++ b/t/lib/textfill.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use Text::Wrap qw(&fill); diff --git a/t/lib/texttabs.t b/t/lib/texttabs.t index 80395f4..ea9012c 100755 --- a/t/lib/texttabs.t +++ b/t/lib/texttabs.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } print "1..3\n"; diff --git a/t/lib/textwrap.t b/t/lib/textwrap.t index bb1d5ca..af24036 100755 --- a/t/lib/textwrap.t +++ b/t/lib/textwrap.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use Text::Wrap qw(&wrap); diff --git a/t/lib/thr5005.t b/t/lib/thr5005.t index 6b3c800..057a08f 100755 --- a/t/lib/thr5005.t +++ b/t/lib/thr5005.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; if (! $Config{'use5005threads'}) { print "1..0 # Skip: not use5005threads\n"; diff --git a/t/lib/tie-push.t b/t/lib/tie-push.t index 23a0a94..b19aa0d 100755 --- a/t/lib/tie-push.t +++ b/t/lib/tie-push.t @@ -2,7 +2,8 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '.'; + push @INC, '../lib'; } { diff --git a/t/lib/tie-stdarray.t b/t/lib/tie-stdarray.t index 5a678a5..c4ae071 100755 --- a/t/lib/tie-stdarray.t +++ b/t/lib/tie-stdarray.t @@ -2,7 +2,8 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '.'; + push @INC, '../lib'; } use Tie::Array; diff --git a/t/lib/tie-stdhandle.t b/t/lib/tie-stdhandle.t index cf3a183..d1f9a81 100755 --- a/t/lib/tie-stdhandle.t +++ b/t/lib/tie-stdhandle.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use Tie::Handle; diff --git a/t/lib/tie-stdpush.t b/t/lib/tie-stdpush.t index 35ae1b8..31af30c 100755 --- a/t/lib/tie-stdpush.t +++ b/t/lib/tie-stdpush.t @@ -2,7 +2,8 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '.'; + push @INC, '../lib'; } use Tie::Array; diff --git a/t/lib/timelocal.t b/t/lib/timelocal.t index 359d71e..100e076 100755 --- a/t/lib/timelocal.t +++ b/t/lib/timelocal.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use Time::Local; diff --git a/t/lib/trig.t b/t/lib/trig.t index 9420cd3..ac34450 100755 --- a/t/lib/trig.t +++ b/t/lib/trig.t @@ -10,7 +10,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use Math::Trig; diff --git a/t/op/64bitint.t b/t/op/64bitint.t index 691d44e..5cfb65a 100644 --- a/t/op/64bitint.t +++ b/t/op/64bitint.t @@ -7,7 +7,7 @@ BEGIN { exit(0); } chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } # This could use many more tests. diff --git a/t/op/assignwarn.t b/t/op/assignwarn.t index b95cec5..2d05b82 100755 --- a/t/op/assignwarn.t +++ b/t/op/assignwarn.t @@ -8,7 +8,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use strict; diff --git a/t/op/attrs.t b/t/op/attrs.t index 615e4d3..2702004 100644 --- a/t/op/attrs.t +++ b/t/op/attrs.t @@ -4,7 +4,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } sub NTESTS () ; diff --git a/t/op/avhv.t b/t/op/avhv.t index cd7c957..5b91fd2 100755 --- a/t/op/avhv.t +++ b/t/op/avhv.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } require Tie::Array; diff --git a/t/op/bless.t b/t/op/bless.t index 46bf6c3..3aaceb8 100644 --- a/t/op/bless.t +++ b/t/op/bless.t @@ -4,7 +4,7 @@ print "1..31\n"; BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; } sub expected { diff --git a/t/op/bop.t b/t/op/bop.t index edee72d..8279aba 100755 --- a/t/op/bop.t +++ b/t/op/bop.t @@ -6,7 +6,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } print "1..35\n"; diff --git a/t/op/closure.t b/t/op/closure.t index c691d6f..5f3245f 100755 --- a/t/op/closure.t +++ b/t/op/closure.t @@ -7,7 +7,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use Config; diff --git a/t/op/defins.t b/t/op/defins.t index 9e714a7..33c74ea 100755 --- a/t/op/defins.t +++ b/t/op/defins.t @@ -6,7 +6,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; $SIG{__WARN__} = sub { $warns++; warn $_[0] }; print "1..14\n"; } diff --git a/t/op/die_exit.t b/t/op/die_exit.t index cb0478b..a389946 100755 --- a/t/op/die_exit.t +++ b/t/op/die_exit.t @@ -7,7 +7,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib' if -e '../lib'; + @INC = '../lib'; } if ($^O eq 'mpeix') { diff --git a/t/op/exists_sub.t b/t/op/exists_sub.t index 3363dfd..d4aa292 100755 --- a/t/op/exists_sub.t +++ b/t/op/exists_sub.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } print "1..9\n"; diff --git a/t/op/filetest.t b/t/op/filetest.t index e00d5fb..f757c79 100755 --- a/t/op/filetest.t +++ b/t/op/filetest.t @@ -5,7 +5,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; } use Config; diff --git a/t/op/fork.t b/t/op/fork.t index 7c2add9..93cf673 100755 --- a/t/op/fork.t +++ b/t/op/fork.t @@ -4,7 +4,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; require Config; import Config; unless ($Config{'d_fork'} or ($^O eq 'MSWin32' and $Config{useithreads} diff --git a/t/op/glob.t b/t/op/glob.t index 4c27445..fc0ba77 100755 --- a/t/op/glob.t +++ b/t/op/glob.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } print "1..6\n"; diff --git a/t/op/goto_xs.t b/t/op/goto_xs.t index 8d9bca1..cf2cafd 100755 --- a/t/op/goto_xs.t +++ b/t/op/goto_xs.t @@ -10,7 +10,7 @@ # break correctly as well. chdir 't' if -d 't'; -unshift @INC, "../lib"; +@INC = '../lib'; $ENV{PERL5LIB} = "../lib"; # turn warnings into fatal errors diff --git a/t/op/grent.t b/t/op/grent.t index 27c9427..211dc91 100755 --- a/t/op/grent.t +++ b/t/op/grent.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, "../lib" if -d "../lib"; + @INC = '../lib'; eval {my @n = getgrgid 0}; if ($@ && $@ =~ /(The \w+ function is unimplemented)/) { print "1..0 # Skip: $1\n"; diff --git a/t/op/gv.t b/t/op/gv.t index bb10b75..431910b 100755 --- a/t/op/gv.t +++ b/t/op/gv.t @@ -6,7 +6,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use warnings; diff --git a/t/op/hashwarn.t b/t/op/hashwarn.t index 9182273..8466a71 100755 --- a/t/op/hashwarn.t +++ b/t/op/hashwarn.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use strict; diff --git a/t/op/int.t b/t/op/int.t index bf21002..7d675a4 100755 --- a/t/op/int.t +++ b/t/op/int.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } print "1..7\n"; diff --git a/t/op/lex_assign.t b/t/op/lex_assign.t index 6665f29..181c842 100755 --- a/t/op/lex_assign.t +++ b/t/op/lex_assign.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } $ENV{PERL_DESTRUCT_LEVEL} = 0 unless $ENV{PERL_DESTRUCT_LEVEL} > 3; diff --git a/t/op/lfs.t b/t/op/lfs.t index 97c920c..feee8cc 100644 --- a/t/op/lfs.t +++ b/t/op/lfs.t @@ -4,7 +4,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; # Don't bother if there are no quad offsets. require Config; import Config; if ($Config{lseeksize} < 8) { diff --git a/t/op/lop.t b/t/op/lop.t index f15201f..d57271a 100755 --- a/t/op/lop.t +++ b/t/op/lop.t @@ -6,7 +6,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } print "1..7\n"; diff --git a/t/op/magic.t b/t/op/magic.t index 27be423..e2acb1f 100755 --- a/t/op/magic.t +++ b/t/op/magic.t @@ -3,7 +3,7 @@ BEGIN { $| = 1; chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; $SIG{__WARN__} = sub { die "Dying on warning: ", @_ }; } diff --git a/t/op/method.t b/t/op/method.t index 6e25310..be4df75 100755 --- a/t/op/method.t +++ b/t/op/method.t @@ -6,7 +6,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; } print "1..53\n"; diff --git a/t/op/misc.t b/t/op/misc.t index 39719b4..f0d7f54 100755 --- a/t/op/misc.t +++ b/t/op/misc.t @@ -4,7 +4,7 @@ # separate executable and can't simply use eval. chdir 't' if -d 't'; -unshift @INC, "../lib"; +@INC = '../lib'; $ENV{PERL5LIB} = "../lib"; $|=1; diff --git a/t/op/mkdir.t b/t/op/mkdir.t index cf8e55d..c5a090c 100755 --- a/t/op/mkdir.t +++ b/t/op/mkdir.t @@ -4,7 +4,7 @@ print "1..9\n"; BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use File::Path; diff --git a/t/op/my_stash.t b/t/op/my_stash.t index 79f3f28..4a1d502 100644 --- a/t/op/my_stash.t +++ b/t/op/my_stash.t @@ -3,7 +3,7 @@ package Foo; BEGIN { - unshift @INC, "../lib"; + @INC = '../lib'; } use Test; diff --git a/t/op/nothr5005.t b/t/op/nothr5005.t index fd36e2e..411a0b4 100755 --- a/t/op/nothr5005.t +++ b/t/op/nothr5005.t @@ -6,7 +6,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, "../lib"; + @INC = '../lib'; require Config; import Config; if ($Config{'use5005threads'}) diff --git a/t/op/pack.t b/t/op/pack.t index 5c215c6..67bd547 100755 --- a/t/op/pack.t +++ b/t/op/pack.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; require Config; import Config; } diff --git a/t/op/pat.t b/t/op/pat.t index 2ba6d93..f009086 100755 --- a/t/op/pat.t +++ b/t/op/pat.t @@ -8,7 +8,7 @@ print "1..223\n"; BEGIN { chdir 't' if -d 't'; - unshift @INC, "../lib" if -d "../lib"; + @INC = '../lib'; } eval 'use Config'; # Defaults assumed if this fails diff --git a/t/op/pwent.t b/t/op/pwent.t index ea89505..4cccbfe 100755 --- a/t/op/pwent.t +++ b/t/op/pwent.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, "../lib" if -d "../lib"; + @INC = '../lib'; eval {my @n = getpwuid 0}; if ($@ && $@ =~ /(The \w+ function is unimplemented)/) { print "1..0 # Skip: $1\n"; diff --git a/t/op/quotemeta.t b/t/op/quotemeta.t index ec247f8..ea62ed8 100755 --- a/t/op/quotemeta.t +++ b/t/op/quotemeta.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; require Config; import Config; } diff --git a/t/op/rand.t b/t/op/rand.t index 97019bb..83186ae 100755 --- a/t/op/rand.t +++ b/t/op/rand.t @@ -17,7 +17,7 @@ BEGIN { chdir "t" if -d "t"; - unshift @INC, "../lib" if -d "../lib"; + @INC = '../lib'; } use strict; diff --git a/t/op/readdir.t b/t/op/readdir.t index ad7a8ab..00199b0 100755 --- a/t/op/readdir.t +++ b/t/op/readdir.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } eval 'opendir(NOSUCH, "no/such/directory");'; diff --git a/t/op/regexp.t b/t/op/regexp.t index 4ffe136..23ae576 100755 --- a/t/op/regexp.t +++ b/t/op/regexp.t @@ -33,7 +33,7 @@ $ENV{PERL_DESTRUCT_LEVEL} = 0 unless $ENV{PERL_DESTRUCT_LEVEL} > 3; BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; } $iters = shift || 1; # Poor man performance suite, 10000 is OK. diff --git a/t/op/regmesg.t b/t/op/regmesg.t index 2267206..f209239 100644 --- a/t/op/regmesg.t +++ b/t/op/regmesg.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } my $debug = 1; diff --git a/t/op/runlevel.t b/t/op/runlevel.t index 3865e52..b6c128b 100755 --- a/t/op/runlevel.t +++ b/t/op/runlevel.t @@ -7,7 +7,7 @@ ## chdir 't' if -d 't'; -unshift @INC, "../lib"; +@INC = '../lib'; $Is_VMS = $^O eq 'VMS'; $Is_MSWin32 = $^O eq 'MSWin32'; $ENV{PERL5LIB} = "../lib" unless $Is_VMS; diff --git a/t/op/sort.t b/t/op/sort.t index 8161701..9095871 100755 --- a/t/op/sort.t +++ b/t/op/sort.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use warnings; print "1..57\n"; diff --git a/t/op/sprintf.t b/t/op/sprintf.t index 8bb7536..1fda31e 100755 --- a/t/op/sprintf.t +++ b/t/op/sprintf.t @@ -8,7 +8,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use warnings; diff --git a/t/op/stat.t b/t/op/stat.t index 45b7ed9..1317ba8 100755 --- a/t/op/stat.t +++ b/t/op/stat.t @@ -4,7 +4,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use Config; diff --git a/t/op/subst.t b/t/op/subst.t index 9757f4c..7dd7a1c 100755 --- a/t/op/subst.t +++ b/t/op/subst.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; require Config; import Config; } diff --git a/t/op/subst_amp.t b/t/op/subst_amp.t index e2e7c0e..7189572 100755 --- a/t/op/subst_amp.t +++ b/t/op/subst_amp.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; require Config; import Config; } diff --git a/t/op/substr.t b/t/op/substr.t index f2a0c6c..891e904 100755 --- a/t/op/substr.t +++ b/t/op/substr.t @@ -6,7 +6,7 @@ print "1..135\n"; BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } use warnings ; diff --git a/t/op/taint.t b/t/op/taint.t index 44f50ae..7cc4447 100755 --- a/t/op/taint.t +++ b/t/op/taint.t @@ -9,7 +9,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; } use strict; diff --git a/t/op/tie.t b/t/op/tie.t index 9543420..696a926 100755 --- a/t/op/tie.t +++ b/t/op/tie.t @@ -6,7 +6,7 @@ # Currently it only tests the untie warning chdir 't' if -d 't'; -unshift @INC, "../lib"; +@INC = '../lib'; $ENV{PERL5LIB} = "../lib"; $|=1; diff --git a/t/op/tiearray.t b/t/op/tiearray.t index 25fda3f..8e78b2f 100755 --- a/t/op/tiearray.t +++ b/t/op/tiearray.t @@ -3,7 +3,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } my %seen; diff --git a/t/op/tiehandle.t b/t/op/tiehandle.t index 6ae3faa..d7e6a78 100755 --- a/t/op/tiehandle.t +++ b/t/op/tiehandle.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } my @expect; diff --git a/t/op/tr.t b/t/op/tr.t index ea665c7..a6406ff 100755 --- a/t/op/tr.t +++ b/t/op/tr.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, "../lib"; + @INC = '../lib'; } print "1..27\n"; diff --git a/t/op/undef.t b/t/op/undef.t index 8944ee3..f6e36a5 100755 --- a/t/op/undef.t +++ b/t/op/undef.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } print "1..27\n"; diff --git a/t/op/universal.t b/t/op/universal.t index a0a74ec..e6db8e6 100755 --- a/t/op/universal.t +++ b/t/op/universal.t @@ -5,7 +5,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; $| = 1; } diff --git a/t/op/ver.t b/t/op/ver.t index 5346f39..63cb716 100755 --- a/t/op/ver.t +++ b/t/op/ver.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, "../lib"; + @INC = '../lib'; } print "1..23\n"; diff --git a/t/pragma/constant.t b/t/pragma/constant.t index dde64ce..450b4d0 100755 --- a/t/pragma/constant.t +++ b/t/pragma/constant.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib' if -d '../lib'; + @INC = '../lib'; } use warnings; diff --git a/t/pragma/diagnostics.t b/t/pragma/diagnostics.t index 15cd6b5..14014f6 100755 --- a/t/pragma/diagnostics.t +++ b/t/pragma/diagnostics.t @@ -1,8 +1,8 @@ #!./perl BEGIN { - chdir '..' if -d '../pod'; - unshift @INC, './lib' if -d './lib'; + chdir '..' if -d '../pod' && -d '../t'; + @INC = 'lib'; } diff --git a/t/pragma/locale.t b/t/pragma/locale.t index 5f60115..c8a0df8 100755 --- a/t/pragma/locale.t +++ b/t/pragma/locale.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; unshift @INC, '.'; require Config; import Config; if (!$Config{d_setlocale} || $Config{ccflags} =~ /\bD?NO_LOCALE\b/) { diff --git a/t/pragma/overload.t b/t/pragma/overload.t index a5949b6..42e4006 100755 --- a/t/pragma/overload.t +++ b/t/pragma/overload.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } package Oscalar; diff --git a/t/pragma/strict.t b/t/pragma/strict.t index 167b360..5b245d0 100755 --- a/t/pragma/strict.t +++ b/t/pragma/strict.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; $ENV{PERL5LIB} = '../lib'; } diff --git a/t/pragma/sub_lval.t b/t/pragma/sub_lval.t index e96c329..3ab8766 100755 --- a/t/pragma/sub_lval.t +++ b/t/pragma/sub_lval.t @@ -2,7 +2,7 @@ print "1..46\n"; BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; } sub a : lvalue { my $a = 34; bless \$a } # Return a temporary diff --git a/t/pragma/subs.t b/t/pragma/subs.t index fe84f5e..cebb635 100755 --- a/t/pragma/subs.t +++ b/t/pragma/subs.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; $ENV{PERL5LIB} = '../lib'; } diff --git a/t/pragma/utf8.t b/t/pragma/utf8.t index d1546fe..1d0bef7 100755 --- a/t/pragma/utf8.t +++ b/t/pragma/utf8.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; $ENV{PERL5LIB} = '../lib'; if ( ord("\t") != 9 ) { # skip on ebcdic platforms print "1..0 # Skip utf8 tests on ebcdic platform.\n"; diff --git a/t/pragma/warnings.t b/t/pragma/warnings.t index a551740..66b4ff9 100644 --- a/t/pragma/warnings.t +++ b/t/pragma/warnings.t @@ -2,7 +2,7 @@ BEGIN { chdir 't' if -d 't'; - unshift @INC, '../lib'; + @INC = '../lib'; $ENV{PERL5LIB} = '../lib'; require Config; import Config; } -- 1.8.3.1