allow blib.pm to be used for testing Win32 module (again)

Message-ID: <vjtjo21l5ksgeab6k9l46d9pvlg5vf86rt@4ax.com>

p4raw-id: //depot/perl@29607

diff --git a/lib/blib.pm b/lib/blib.pm
index 45ccd9b..8a39dc8 100644 (file)
--- 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 (@_)
   {