diff options
| author | Jan Dubois <jand@activestate.com> | 2006-12-20 10:53:51 -0800 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2006-12-21 09:47:34 +0000 |
| commit | 6c6463e2a6dcc80d76e91c5aaf19f3816899b04a (patch) | |
| tree | 6a2c9da439cf7da373259554cd7fbbdc40d8e0cc | |
| parent | add1a1a3c3dc28dd49272f4754cfc04acae28e3b (diff) | |
| download | perl-6c6463e2a6dcc80d76e91c5aaf19f3816899b04a.tar.gz | |
allow blib.pm to be used for testing Win32 module (again)
Message-ID: <vjtjo21l5ksgeab6k9l46d9pvlg5vf86rt@4ax.com>
p4raw-id: //depot/perl@29607
| -rw-r--r-- | lib/blib.pm | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/blib.pm b/lib/blib.pm index 45ccd9b518..8a39dc871f 100644 --- a/lib/blib.pm +++ b/lib/blib.pm @@ -46,7 +46,18 @@ $Verbose = 0; sub import { my $package = shift; - my $dir = getcwd; + my $dir; + if ($^O eq "MSWin32") { + # We don't use getcwd() on Windows because it will internally + # call Win32::GetCwd(), which will get the Win32 module loaded. + # That means that it would not be possible to run `make test` + # for the Win32 module because blib.pm would always load the + # installed version before @INC gets updated with the blib path. + chomp($dir = `cd`); + } + else { + $dir = getcwd; + } if ($^O eq 'VMS') { ($dir = VMS::Filespec::unixify($dir)) =~ s-/\z--; } if (@_) { |