Fix grep portability issues.

Grep on Solaris does not support -q.
Reported by Summum Bonum.

	* NEWS: Add a stub for 2.4.2.
	* THANKS: Add Summum Bonum.
	* tests/atlocal.in (EGREP): New.
	(CC, CXX, XSLTPROC): Make it possible to override them via
	envvars.
	* tests/java.at: Use $EGREP instead of egrep.
	Use AT_CHECK's ignore instead of grep's -q.

diff --git a/ChangeLog b/ChangeLog
index f28a8478cee1bdc42d46cd08b18c1579f37e7ee0..5320ec3ea2d46cfcaa56b0e0d0007a621d2e3739 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-01-08  Akim Demaille  <demaille@gostai.com>
+
+       Fix grep portability issues.
+       Grep on Solaris does not support -q.
+       Reported by Summum Bonum.
+       
+       * NEWS: Add a stub for 2.4.2.
+       * THANKS: Add Summum Bonum.
+       * tests/atlocal.in (EGREP): New.
+       (CC, CXX, XSLTPROC): Make it possible to override them via
+       envvars.
+       * tests/java.at: Use $EGREP instead of egrep.
+       Use AT_CHECK's ignore instead of grep's -q.
+
 2008-12-11  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        Version 2.4.1.

diff --git a/NEWS b/NEWS
index 7d1a444d55b41b99bb4ae9c0c237f7897b41f240..69c6d3b25613fb3f18179201307edc23ba3de76b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 Bison News
 ----------
 
+* Changes in version 2.4.2 (????-??-??):
+
 * Changes in version 2.4.1 (2008-12-11):
 
 ** In the GLR defines file, unexpanded M4 macros in the yylval and yylloc
@@ -1049,9 +1051,9 @@ End:
 -----
 
 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-This file is part of Bison, the GNU Compiler Compiler.
+This file is part of Bison, the GNU Parser Generator.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/THANKS b/THANKS
index 40291c71e690056ec7a80e6eaf9e71b708a49a86..d7adddddc0c11df3121b9d2d7311783c6129803e 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -78,11 +78,12 @@ Raja R Harinath           harinath@cs.umn.edu
 Richard Stallman          rms@gnu.org
 Robert Anisko             anisko_r@epita.fr
 Satya Kiran Popuri        satyakiran@gmail.com
-Sebastien Fricker         sebastien.fricker@gmail.com
 Sebastian Setzer          sebastian.setzer.ext@siemens.com
+Sebastien Fricker         sebastien.fricker@gmail.com
 Sergei Steshenko          sergstesh@yahoo.com
 Shura                     debil_urod@ngs.ru
 Steve Murphy              murf@parsetree.com
+Summum Bonum              sum@geekhouse.org
 Tim Josling               tej@melbpc.org.au
 Tim Van Holder            tim.van.holder@pandora.be
 Tom Lane                  tgl@sss.pgh.pa.us

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 1a5f5f4fe3cee99df297d174375751feff8d58f9..91ba6742108e348d476ba0b06baa9a922ff9a203 100644 (file)
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,11 +1,11 @@
 # @configure_input@                                    -*- shell-script -*-
 # Configurable variable values for Bison test suite.
 
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free
-# Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+# 2009 Free Software Foundation, Inc.
 
 # We need a C compiler.
-CC='@CC@'
+: ${CC='@CC@'}
 
 # We want no optimization.
 CFLAGS='@O0CFLAGS@ @WARN_CFLAGS@ @WERROR_CFLAGS@'
@@ -17,7 +17,7 @@ CPPFLAGS="-I$abs_top_builddir/lib @CPPFLAGS@"
 GCC='@GCC@'
 
 # The C++ compiler.
-CXX='@CXX@'
+: ${CXX='@CXX@'}
 
 # If 'exit 77'; skip all C++ tests; otherwise ':'.
 BISON_CXX_WORKS='@BISON_CXX_WORKS@'
@@ -38,4 +38,7 @@ CONF_JAVAC='@CONF_JAVAC@'
 CONF_JAVA='@CONF_JAVA@'
 
 # Empty if no xsltproc was found
-XSLTPROC='@XSLTPROC@'
+: ${XSLTPROC='@XSLTPROC@'}
+
+# We need egrep.
+: ${EGREP='@EGREP@'}

diff --git a/tests/java.at b/tests/java.at
index a3e1a0ede6b7442689e5fdbf84f063bc52588779..ac6564f7e167850f339ea8c43095680f83976151 100644 (file)
--- a/tests/java.at
+++ b/tests/java.at
@@ -1,6 +1,6 @@
 # Java tests for simple calculator.           -*- Autotest -*-
 
-# Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -134,7 +134,7 @@ AT_LOCATION_IF([[
 ]], [[
   public void yyerror (String s)
   {
-    System.err.println (s); 
+    System.err.println (s);
   }
 ]])[
 
@@ -342,7 +342,7 @@ _AT_CHECK_JAVA_CALC_ERROR([$1], [/dev/null],
 #   first error is ")", which is needed to recover from the error and
 #   produce the "0" that triggers the "0 != 1" error.
 #
-_AT_CHECK_JAVA_CALC_ERROR([$1], 
+_AT_CHECK_JAVA_CALC_ERROR([$1],
                           [() + (1 + 1 + 1 +) + (* * *) + (1 * 2 * *) = 1],
 [1: syntax error, unexpected ')', expecting number or '-' or '(' or '!'
 1: syntax error, unexpected ')', expecting number or '-' or '(' or '!'
@@ -426,7 +426,7 @@ start: "end" {$2};
 class m4_default([$3], [Position]) {}
 ])
 AT_BISON_CHECK([[YYParser.y]])
-AT_CHECK([[grep -q '[mb]4_' YYParser.y]], [1])
+AT_CHECK([[grep '[mb]4_' YYParser.y]], [1], [ignore])
 AT_JAVA_COMPILE([[YYParser.java]])
 ])
 
@@ -458,7 +458,7 @@ m4_define([AT_CHECK_JAVA_MINIMAL_W_LEXER],
   {
     $3
   }
-  
+
   $4
 }], [$5], [$7])])
 
@@ -747,9 +747,9 @@ AT_CHECK_JAVA_MINIMAL([[
 %define location_type "MyLoc"
 %define position_type "MyPos"
 %code { class MyPos {} }]], [[$$ = $<java.awt.Color>1;]], [[MyPos]])
-AT_CHECK([[grep -q 'java.awt.Color' YYParser.java]])
-AT_CHECK([[egrep -v ' */?\*' YYParser.java | grep -q 'Position']], [1])
-AT_CHECK([[egrep -v ' */?\*' YYParser.java | grep -q 'Location']], [1])
+AT_CHECK([[grep 'java.awt.Color' YYParser.java]], [0], [ignore])
+AT_CHECK([[$EGREP -v ' */?\*' YYParser.java | grep 'Position']], [1], [ignore])
+AT_CHECK([[$EGREP -v ' */?\*' YYParser.java | grep 'Location']], [1], [ignore])
 
 AT_CHECK_JAVA_MINIMAL_W_LEXER([[
 %define stype "java.awt.Color"
@@ -759,8 +759,8 @@ AT_CHECK_JAVA_MINIMAL_W_LEXER([[
 %code { class MyPos {} }]], [], [[return EOF;]], [],
 [[$$ = $<java.awt.Color>1;]],
 [[java.awt.Color]], [[MyPos]], [[MyLoc]])
-AT_CHECK([[grep -q 'java.awt.Color' YYParser.java]])
-AT_CHECK([[egrep -v ' */?\*' YYParser.java | grep -q 'Position']], [1])
-AT_CHECK([[egrep -v ' */?\*' YYParser.java | grep -q 'Location']], [1])
+AT_CHECK([[grep 'java.awt.Color' YYParser.java]], [0], [ignore])
+AT_CHECK([[$EGREP -v ' */?\*' YYParser.java | grep 'Position']], [1], [ignore])
+AT_CHECK([[$EGREP -v ' */?\*' YYParser.java | grep 'Location']], [1], [ignore])
 
 AT_CLEANUP