remove . from default @*INC

rakudo · May 8, 2012 · b09c6f8 · b09c6f8
1 parent 30c0796
commit b09c6f8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/docs/ChangeLog b/docs/ChangeLog
@@ -18,6 +18,7 @@ New in 2012.05
 + lib.pm
 + updated calling conventions for traits
 + implemented fff flip-flop operator; improvements to ff form also
++ removed current directory from default library search path
 
 New in 2012.04.1
 + autvivification for arrays and hashes

diff --git a/src/core/terms.pm b/src/core/terms.pm
@@ -71,7 +71,6 @@ sub term:<time>() { nqp::p6box_i(pir::time__I()) }
     }
     @INC.push($VM<config><libdir> ~ $VM<config><versiondir> ~ '/languages/perl6/lib');
     @INC.push('.'); # XXX: remove this when 'use lib' works fine
-
     my $I := nqp::atkey(nqp::atkey(%*COMPILING, '%?OPTIONS'), 'I');
     if pir::defined($I) {
         if pir::does($I, 'array') {

diff --git a/t/harness b/t/harness
@@ -13,7 +13,8 @@ use Pod::Usage;
 
 my $slash = $^O eq 'MSWin32' ? '\\' : '/';
 $ENV{'HARNESS_PERL'} = ".${slash}perl6";
-$ENV{'PERL6LIB'} = 'lib';
+my $path_sep = $^O eq 'MSWin32' ? ';' : ':';
+$ENV{'PERL6LIB'} = join $path_sep, qw/ lib . /;
 use Test::Harness;
 $Test::Harness::switches = '';
 

diff --git a/tools/autounfudge.pl b/tools/autounfudge.pl
@@ -81,7 +81,8 @@ =head1 MISCELLANEA
             'jobs=i'        => \$threads_num,
             or usage();
 
-$ENV{PERL6LIB} = 'lib' unless $keep_env;
+my $path_sep = $^O eq 'MSWin32' ? ';' : ':';
+$ENV{PERL6LIB} = join($path_sep, qw/lib ./) unless $keep_env;
 
 my @files;
 

diff --git a/tools/update_passing_test_data.pl b/tools/update_passing_test_data.pl
@@ -123,7 +123,7 @@ sub read_specfile {
 sub get_harness {
     return TAP::Harness->new({
             verbosity   => -2,
-            exec        => [$^X, 'tools/perl6-limited.pl'],
+            exec        => [$^X, 'tools/perl6-limited.pl', qw/-Ilib -I./],
             merge       => 1,
     });
 }