Assimilate Cwd 2.12 from CPAN. Cwd wasn't in Maintainers, so change

[p5sagit/p5-mst-13.2.git] / ext / Cwd / t / cwd.t

diff --git a/ext/Cwd/t/cwd.t b/ext/Cwd/t/cwd.t
index 83b6f7f..92ec184 100644 (file)
--- a/ext/Cwd/t/cwd.t
+++ b/ext/Cwd/t/cwd.t
@@ -1,19 +1,20 @@
-#!./perl -T
+#!./perl
 
+use Cwd;
 BEGIN {
     chdir 't' if -d 't';
-    @INC = '../lib';
 }
 
 use Config;
-use Cwd;
 use strict;
 use warnings;
+use File::Spec;
 use File::Path;
 
 use Test::More tests => 16;
 
 my $IsVMS = $^O eq 'VMS';
+my $IsMacOS = $^O eq 'MacOS';
 
 # check imports
 can_ok('main', qw(cwd getcwd fastcwd fastgetcwd));
@@ -28,19 +29,27 @@ eval { fastcwd };
 
 # Must find an external pwd (or equivalent) command.
 
+my $pwd = $^O eq 'MSWin32' ? "cmd" : "pwd";
 my $pwd_cmd =
-    ($^O eq "MSWin32" || $^O eq "NetWare") ?
+    ($^O eq "NetWare") ?
         "cd" :
-        (grep { -x && -f } map { "$_/pwd$Config{exe_ext}" }
+    ($IsMacOS) ?
+        "pwd" :
+        (grep { -x && -f } map { "$_/$pwd$Config{exe_ext}" }
                           split m/$Config{path_sep}/, $ENV{PATH})[0];
 
 $pwd_cmd = 'SHOW DEFAULT' if $IsVMS;
-
-print "# native pwd = '$pwd_cmd'\n";
+if ($^O eq 'MSWin32') {
+    $pwd_cmd =~ s,/,\\,g;
+    $pwd_cmd = "$pwd_cmd /c cd";
+}
+$pwd_cmd =~ s=\\=/=g if ($^O eq 'dos');
 
 SKIP: {
     skip "No native pwd command found to test against", 4 unless $pwd_cmd;
 
+    print "# native pwd = '$pwd_cmd'\n";
+
     local @ENV{qw(PATH IFS CDPATH ENV BASH_ENV)};
     my ($pwd_cmd_untainted) = $pwd_cmd =~ /^(.+)$/; # Untaint.
     chomp(my $start = `$pwd_cmd_untainted`);
@@ -50,16 +59,33 @@ SKIP: {
     # DCL SHOW DEFAULT has leading spaces
     $start =~ s/^\s+// if $IsVMS;
     SKIP: {
-        skip "'$pwd_cmd' failed, nothing to test against", 4 if $?;
+        skip("'$pwd_cmd' failed, nothing to test against", 4) if $?;
+        skip("/afs seen, paths unlikely to match", 4) if $start =~ m|/afs/|;
+
+       # Darwin's getcwd(3) (which Cwd.xs:bsd_realpath() uses which
+       # Cwd.pm:getcwd uses) has some magic related to the PWD
+       # environment variable: if PWD is set to a directory that
+       # looks about right (guess: has the same (dev,ino) as the '.'?),
+       # the PWD is returned.  However, if that path contains
+       # symlinks, the path will not be equal to the one returned by
+       # /bin/pwd (which probably uses the usual walking upwards in
+       # the path -trick).  This situation is easy to reproduce since
+       # /tmp is a symlink to /private/tmp.  Therefore we invalidate
+       # the PWD to force getcwd(3) to (re)compute the cwd in full.
+       # Admittedly fixing this in the Cwd module would be better
+       # long-term solution but deleting $ENV{PWD} should not be
+       # done light-heartedly. --jhi
+       delete $ENV{PWD} if $^O eq 'darwin';
 
        my $cwd        = cwd;
        my $getcwd     = getcwd;
        my $fastcwd    = fastcwd;
        my $fastgetcwd = fastgetcwd;
-       is(cwd(),       $start, 'cwd()');
-       is(getcwd(),    $start, 'getcwd()');
-       is(fastcwd(),   $start, 'fastcwd()');
-       is(fastgetcwd(),$start, 'fastgetcwd()');
+
+       is($cwd,        $start, 'cwd()');
+       is($getcwd,     $start, 'getcwd()');
+       is($fastcwd,    $start, 'fastcwd()');
+       is($fastgetcwd, $start, 'fastgetcwd()');
     }
 }
 
@@ -71,6 +97,9 @@ if( $IsVMS ) {
     $want =~ s|/|\.|g;
     $want .= '\]';
     $want = '((?i)' . $want . ')';  # might be ODS-2 or ODS-5
+} elsif ( $IsMacOS ) {
+    $_ = ":$_" for ($Top_Test_Dir, $Test_Dir);
+    s|/|:|g, s|$|:| for ($want, $Test_Dir);
 }
 
 mkpath(["$Test_Dir"], 0, 0777);
@@ -83,15 +112,16 @@ like(fastgetcwd(), qr|$want$|, '        + fastgetcwd()');
 
 # Cwd::chdir should also update $ENV{PWD}
 like($ENV{PWD}, qr|$want$|,      'Cwd::chdir() updates $ENV{PWD}');
-Cwd::chdir "..";
+my $updir = File::Spec->updir;
+Cwd::chdir $updir;
 print "#$ENV{PWD}\n";
-Cwd::chdir "..";
+Cwd::chdir $updir;
 print "#$ENV{PWD}\n";
-Cwd::chdir "..";
+Cwd::chdir $updir;
 print "#$ENV{PWD}\n";
-Cwd::chdir "..";
+Cwd::chdir $updir;
 print "#$ENV{PWD}\n";
-Cwd::chdir "..";
+Cwd::chdir $updir;
 print "#$ENV{PWD}\n";
 
 rmtree([$Top_Test_Dir], 0, 0);
@@ -99,6 +129,9 @@ rmtree([$Top_Test_Dir], 0, 0);
 if ($IsVMS) {
     like($ENV{PWD}, qr|\b((?i)t)\]$|);
 }
+elsif ($IsMacOS) {
+    like($ENV{PWD}, qr|\bt:$|);
+}
 else {
     like($ENV{PWD}, qr|\bt$|);
 }
@@ -111,7 +144,7 @@ SKIP: {
 
     my $abs_path      =  Cwd::abs_path("linktest");
     my $fast_abs_path =  Cwd::fast_abs_path("linktest");
-    my $want          = "t/$Test_Dir";
+    my $want          =  File::Spec->catdir("t", $Test_Dir);
 
     like($abs_path,      qr|$want$|);
     like($fast_abs_path, qr|$want$|);