Update makerel to make a release from a git checkout.

[p5sagit/p5-mst-13.2.git] / ext / Win32 / t / Unicode.t

diff --git a/ext/Win32/t/Unicode.t b/ext/Win32/t/Unicode.t
index 8a435f9..382b13a 100644 (file)
--- a/ext/Win32/t/Unicode.t
+++ b/ext/Win32/t/Unicode.t
@@ -1,19 +1,14 @@
 use strict;
 use Test;
-use Win32;
-
 use Cwd qw(cwd);
+use Win32;
 
 BEGIN {
-    if ($^O eq 'cygwin') {
-       print "1..0 # Skip: Cygwin doesn't support Unicode filenames\n";
-       exit 0;
-    }
     unless (defined &Win32::BuildNumber && Win32::BuildNumber() >= 820 or $] >= 5.008009) {
        print "1..0 # Skip: Needs ActivePerl 820 or Perl 5.8.9 or later\n";
        exit 0;
     }
-    unless ((Win32::FsType())[1] & 4) {
+    if ((((Win32::FsType())[1] & 4) == 0) || (Win32::FsType() =~ /^FAT/)) {
        print "1..0 # Skip: Filesystem doesn't support Unicode\n";
        exit 0;
     }
@@ -24,6 +19,7 @@ BEGIN {
 }
 
 my $home = Win32::GetCwd();
+my $cwd  = cwd(); # may be a Cygwin path
 my $dir  = "Foo \x{394}\x{419} Bar \x{5E7}\x{645} Baz";
 my $file = "$dir\\xyzzy \x{394}\x{419} plugh \x{5E7}\x{645}";
 
@@ -64,16 +60,26 @@ ok($long, Win32::GetLongPathName($home)."\\$dir");
 
 # We can Win32::SetCwd() into the Unicode directory
 ok(Win32::SetCwd($dir));
-ok(Win32::GetLongPathName(Win32::GetCwd()), $long);
 
+my $w32dir = Win32::GetCwd();
 # cwd() also returns a usable ANSI directory name
-(my $cwd = cwd) =~ s,/,\\,g;
-ok(Win32::GetLongPathName($cwd), $long);
+my $subdir = cwd();
 
-# change back to home directory
+# change back to home directory to make sure relative paths
+# in @INC continue to work
 ok(chdir($home));
 ok(Win32::GetCwd(), $home);
 
+ok(Win32::GetLongPathName($w32dir), $long);
+
+# cwd() on Cygwin returns a mapped path that we need to translate
+# back to a Windows path. Invoking `cygpath` on $subdir doesn't work.
+if ($^O eq "cygwin") {
+    $subdir = Cygwin::posix_to_win_path($subdir, 1);
+}
+$subdir =~ s,/,\\,g;
+ok(Win32::GetLongPathName($subdir), $long);
+
 # We can chdir() into the Unicode directory if we use the ANSI name
 ok(chdir(Win32::GetANSIPathName($dir)));
 ok(Win32::GetLongPathName(Win32::GetCwd()), $long);