From: Reini Urban <rurban@x-ray.at>
Date: Thu, 4 Mar 2010 17:09:35 +0000 (+0000)
Subject: Support cygwin-1.7 mount
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=5564a16944f291c2122d58c95dbf14d9010de2f5;p=p5sagit%2Fp5-mst-13.2.git

Support cygwin-1.7 mount
---

diff --git a/t/lib/cygwin.t b/t/lib/cygwin.t
index 497f381..e4fde17 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