[perl #73382] [PATCH] Support cygwin-1.7 mount, t/lib/cygwin.t regression

["Reini Urban via RT" <perlbug-followup at perl dot org>]

Patch as attachment

Solves ticket #73382
META ticket #73298 (But I cannot modify deps there)
-- 
Reini Urban
http://phpwiki.org/  http://murbreak.at/

>From b9a3b2d2937e98405c1c888722540f53d81ffeb7 Mon Sep 17 00:00:00 2001
From: Reini Urban <rurban@x-ray.at>
Date: Thu, 4 Mar 2010 17:09:35 +0000
Subject: [PATCH] Support cygwin-1.7 mount

---
 t/lib/cygwin.t |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

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
-- 
1.6.4.2


--
Problem reports:       http://cygwin.com/problems.html
FAQ:                   http://cygwin.com/faq/
Documentation:         http://cygwin.com/docs.html
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple