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 07bf5a9d98da04346e85b893b271ba1d439433cb..bbdcc0f2aee75223a0d28d3d67e917e75f5b0b0b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ GNU Bison NEWS
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 

+** Bug fixes
+
+  Portability issues in the test suite.

 
 * Noteworthy changes in release 3.0 (2013-07-25) [stable]
 
 
 * Noteworthy changes in release 3.0 (2013-07-25) [stable]
 

diff --git a/THANKS b/THANKS
index 321a8b8ac4b0cef82e644b0a513c215acdcb4341..2d4a6a994f586f610ccfac52c944736f52d4297b 100644 (file)
--- 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
 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
 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 2b206988d411b2090992a44e1be9422a59f80d54..58998fe71dce8616587b688977d04b556cf23a47 100644 (file)
--- a/tests/java.at
+++ b/tests/java.at
@@ -725,18 +725,23 @@ AT_CLEANUP
 
 AT_SETUP([Java constructor init and init_throws])
 
 
 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}
 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}]])
 %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}
 
 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;]])
 %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
 
 
 AT_CLEANUP