summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorReini Urban <rurban@x-ray.at>2010-03-04 17:09:35 +0000
committerRafael Garcia-Suarez <rgs@consttype.org>2010-03-08 09:58:59 +0100
commit5564a16944f291c2122d58c95dbf14d9010de2f5 (patch)
treefca6f1eb6cbcb931d9815dca2d74920e42fc1863 /t
parent22f163041726650629bf28dcd039ad3970b34019 (diff)
downloadperl-5564a16944f291c2122d58c95dbf14d9010de2f5.tar.gz
Support cygwin-1.7 mount
Diffstat (limited to 't')
-rw-r--r--t/lib/cygwin.t6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/lib/cygwin.t b/t/lib/cygwin.t
index 497f38118e..e4fde170d9 100644
--- a/t/lib/cygwin.t
+++ b/t/lib/cygwin.t
@@ -44,12 +44,12 @@ chdir($pwd);
is(Cygwin::win_to_posix_path($winpath, 1), "/", "win to absolute posix path");
my $mount = join '', `/usr/bin/mount`;
-$mount =~ m|on /usr/bin type .+ \((\w+mode)[,\)]|m;
-my $binmode = $1 eq 'binmode';
+$mount =~ m|on /usr/bin type .+ \((\w+)[,\)]|m;
+my $binmode = $1 =~ /binmode|binary/;
is(Cygwin::is_binmount("/"), $binmode ? 1 : '', "check / for binmount");
my $rootmnt = Cygwin::mount_flags("/");
-ok($binmode ? ($rootmnt =~ /,binmode/) : ($rootmnt =~ /,textmode/), "check / mount_flags");
+ok($binmode ? ($rootmnt =~ /,(binmode|binary)/) : ($rootmnt =~ /,textmode/), "check / mount_flags");
is(Cygwin::mount_flags("/cygdrive") =~ /,cygdrive/, 1, "check cygdrive mount_flags");
# Cygdrive mount prefix