From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jturney@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2201)
 id DFD92384C002; Wed, 18 Nov 2020 16:27:12 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DFD92384C002
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Jon TURNEY <jturney@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: Use grep in text mode to look for version
 strings
X-Act-Checkin: newlib-cygwin
X-Git-Author: Jon Turney <jon.turney@dronecode.org.uk>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 57635f85819469d056057748574b10c217a11788
X-Git-Newrev: ff315bd18f81c8ed90dfd4a7c1b673d9cd67dc8a
Message-Id: <20201118162712.DFD92384C002@sourceware.org>
Date: Wed, 18 Nov 2020 16:27:12 +0000 (GMT)
X-BeenThere: cygwin-cvs@cygwin.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Cygwin core component git logs <cygwin-cvs.cygwin.com>
List-Unsubscribe: <https://cygwin.com/mailman/options/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=unsubscribe>
List-Archive: <https://cygwin.com/pipermail/cygwin-cvs/>
List-Help: <mailto:cygwin-cvs-request@cygwin.com?subject=help>
List-Subscribe: <https://cygwin.com/mailman/listinfo/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=subscribe>
X-List-Received-Date: Wed, 18 Nov 2020 16:27:13 -0000

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=ff315bd18f81c8ed90dfd4a7c1b673d9cd67dc8a

commit ff315bd18f81c8ed90dfd4a7c1b673d9cd67dc8a
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Wed Oct 28 20:59:53 2020 +0000

    Cygwin: Use grep in text mode to look for version strings
    
    Invoke grep in text mode when looking for version strings inside the
    cygwin DLL, so it outputs something more informative than:
    
      Binary file ../cygwin/cygwin0.dll matches

Diff:
---
 winsup/testsuite/config/default.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/winsup/testsuite/config/default.exp b/winsup/testsuite/config/default.exp
index 3936979a6..8033ea627 100644
--- a/winsup/testsuite/config/default.exp
+++ b/winsup/testsuite/config/default.exp
@@ -1,7 +1,7 @@
 proc winsup_version {} {
     global env
     global rootme
-    clone_output "\n[exec grep ^%%% $rootme/../cygwin/cygwin0.dll]\n"
+    clone_output "\n[exec grep -a ^%%% $rootme/../cygwin/cygwin0.dll]\n"
     if { [info exists env(CYGWIN)] } {
         clone_output "CYGWIN=$env(CYGWIN)\n"
     } else {