From: Akim Demaille <akim@lrde.epita.fr>
Date: Wed, 4 Sep 2013 15:23:37 +0000 (+0200)
Subject: tests: do not use grep -q
X-Git-Tag: v3.0.1~32
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/0a244a2269aa09031bf3f92b68fbab4578beec74

tests: do not use grep -q

Reported by Daniel Galloway.
http://lists.gnu.org/archive/html/bug-bison/2013-08/msg00020.html

* tests/java.at: Ignore grep's output instead.
---

diff --git a/NEWS b/NEWS
index 07bf5a9d..bbdcc0f2 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ GNU Bison NEWS
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
+** Bug fixes
+
+  Portability issues in the test suite.
 
 * Noteworthy changes in release 3.0 (2013-07-25) [stable]
 
diff --git a/THANKS b/THANKS
index 321a8b8a..2d4a6a99 100644
--- a/THANKS
+++ b/THANKS
@@ -31,6 +31,7 @@ Cris van Pelt             cris@amf03054.office.wxs.nl
 Csaba Raduly              csaba_22@yahoo.co.uk
 Dagobert Michelsen        dam@baltic-online.de
 Daniel Frużyński          daniel@poradnik-webmastera.com
+Daniel Galloway           dg1751@att.com
 Daniel Hagerty            hag@gnu.org
 David J. MacKenzie        djm@gnu.org
 David Kastrup             dak@gnu.org
diff --git a/tests/java.at b/tests/java.at
index 2b206988..58998fe7 100644
--- a/tests/java.at
+++ b/tests/java.at
@@ -725,18 +725,23 @@ AT_CLEANUP
 
 AT_SETUP([Java constructor init and init_throws])
 
+m4_pushdef([AT_Witness],
+[super("Test Thread"); if (true) throw new InterruptedException();])
+
 AT_CHECK_JAVA_MINIMAL([[
 %define extends {Thread}
-%code init { super("Test Thread"); if (true) throw new InterruptedException(); }
+%code init { ]AT_Witness[ }
 %define init_throws {InterruptedException}
 %lex-param {int lex_param}]])
-AT_CHECK([[grep -q 'super("Test Thread"); if (true) throw new InterruptedException();' YYParser.java]])
+AT_CHECK([[grep ']AT_Witness[' YYParser.java]], 0, [ignore])
 
 AT_CHECK_JAVA_MINIMAL_W_LEXER([[
 %define extends {Thread}
-%code init { super("Test Thread"); if (true) throw new InterruptedException(); }
+%code init { ]AT_Witness[ }
 %define init_throws {InterruptedException}]], [], [[return EOF;]])
-AT_CHECK([[grep -q 'super("Test Thread"); if (true) throw new InterruptedException();' YYParser.java]])
+AT_CHECK([[grep ']AT_Witness[' YYParser.java]], 0, [ignore])
+
+m4_popdef([AT_Witness])
 
 AT_CLEANUP