Better fix for bug #6665

Add a parameter to S_incpush to indicate if the new directory should be
appended or prepended to @INC, and use it set to TRUE when parsing the
shebang line.

There is also a better version of the test.

This replaces commit ccb8f6a64f3dd06b4360bc27c194b28e6766a6ad.

1 files changed, 3 insertions, 3 deletions

diff --git a/t/run/switchI.t b/t/run/switchI.t
index 41192cd765..398f816e2d 100644
--- a/t/run/switchI.t
+++ b/t/run/switchI.t
@@ -15,15 +15,15 @@ my $Is_VMS   = $^O eq 'VMS';
 my $lib;
 
 $lib = $Is_MacOS ? ':Bla:' : 'Bla';
-ok(grep { $_ eq $lib } @INC);
+ok(grep { $_ eq $lib } @INC[0..($#INC-1)]);
 SKIP: {
   skip 'Double colons not allowed in dir spec', 1 if $Is_VMS;
   $lib = $Is_MacOS ? 'Foo::Bar:' : 'Foo::Bar';
-  ok(grep { $_ eq $lib } @INC);
+  ok(grep { $_ eq $lib } @INC[0..($#INC-1)]);
 }
 
 $lib = $Is_MacOS ? ':Bla2:' : 'Bla2';
-fresh_perl_is("print grep { \$_ eq '$lib' } \@INC", $lib,
+fresh_perl_is("print grep { \$_ eq '$lib' } \@INC[0..(\$#INC-1)]", $lib,
 	      { switches => ['-IBla2'] }, '-I');
 SKIP: {
   skip 'Double colons not allowed in dir spec', 1 if $Is_VMS;