X-Recipient: archive-cygwin AT delorie DOT com
X-SWARE-Spam-Status: No, hits=-10.6 required=5.0 	tests=BAYES_00,RCVD_IN_DNSWL_HI
X-Spam-Check-By: sourceware.org
Subject: [perl #73382] [PATCH] Support cygwin-1.7 mount, t/lib/cygwin.t regression
From: "Reini Urban via RT" <perlbug-followup AT perl DOT org>
Reply-To: perlbug-followup AT perl DOT org
In-Reply-To: <4B93811C.8020004@x-ray.at>
References: <RT-Ticket-73382 AT perl DOT org> <5 DOT 11 DOT 5_5596_1267957135 AT mail DOT aon DOT at> <4B93811C DOT 8020004 AT x-ray DOT at>
Message-ID: <rt-3.6.HEAD-16869-1267958115-1457.73382-94-0@perl.org>
X-RT-Loop-Prevention: perl
RT-Ticket: perl #73382
Managed-by: RT 3.6.HEAD (http://www.bestpractical.com/rt/)
RT-Originator: rurban AT x-ray DOT at
To: cygwin AT cygwin DOT com
MIME-Version: 1.0
X-RT-Original-Encoding: utf-8
Content-type: multipart/mixed; boundary="----------=_1267958116-16869-97"
Date: Sun, 07 Mar 2010 02:35:16 -0800
Mailing-List: contact cygwin-help AT cygwin DOT com; run by ezmlm
Precedence: bulk
List-Id: <cygwin.cygwin.com>
List-Unsubscribe: <mailto:cygwin-unsubscribe-archive-cygwin=delorie DOT com AT cygwin DOT com>
List-Subscribe: <mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive: <http://sourceware.org/ml/cygwin/>
List-Post: <mailto:cygwin AT cygwin DOT com>
List-Help: <mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
Sender: cygwin-owner AT cygwin DOT com
Mail-Followup-To: cygwin AT cygwin DOT com
Delivered-To: mailing list cygwin AT cygwin DOT com

------------=_1267958116-16869-97
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="utf-8"

Patch as attachment

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


------------=_1267958116-16869-97
Content-Type: text/x-patch; name="0001-Support-cygwin-1.7-mount.patch"
Content-Disposition: inline; filename="0001-Support-cygwin-1.7-mount.patch"
Content-Transfer-Encoding: 7bit
RT-Attachment: 73382/665162/317590

From b9a3b2d2937e98405c1c888722540f53d81ffeb7 Mon Sep 17 00:00:00 2001
From: Reini Urban <rurban AT x-ray DOT 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



------------=_1267958116-16869-97
Content-Type: text/plain; charset=us-ascii

--
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
------------=_1267958116-16869-97--