Bruno Haible wrote: > Hi Jim, > > Compared to the prerelease, grep 2.10 has some improvements and some > regression. > > "make" works equally well, unchanged. > > 1) Originally, "make check" failed gave an error "sh: VERSION=2.9.69-f91c: > is not an identifier", whereas "gmake check" didn't. > (My assessment that the SHELL variable needed to be changed [1] was apparently > wrong.) > In 2.10, the situation is the same. > > Whereas the patch I had proposed in [2] made "make check" pass. > The next patch [3] was OK as well. The commit > af8be8854b7719aea3c194a2dfbfce6c37d646f6, however, broke it. Here is a fix: > > > 2011-11-20 Bruno Haible <[email protected]> > > Fix "make check" error on OSF/1. > * tests/Makefile.am (TESTS_ENVIRONMENT): Test the value of the variable > BASH_VERSION, not the literal ASH_VERSION. > > --- tests/Makefile.am.bak 2011-11-12 17:49:36.000000000 +0100 > +++ tests/Makefile.am 2011-11-20 13:46:13.000000000 +0100 > @@ -106,7 +106,7 @@ > tmp__=$$TMPDIR; test -d "$$tmp__" || tmp__=.; \ > TMPDIR=$$tmp__; export TMPDIR; \ > \ > - if test -n "$BASH_VERSION" || (eval "export v=x") 2>/dev/null; then \ > + if test -n "$$BASH_VERSION" || (eval "export v=x") 2>/dev/null; then \ > export_with_values () { export "$$@"; }; \ > else \ > export_with_values () \
Thanks, Bruno. Applied: >From a1482fbe39b58e26b8a05d9c5ed22969fbcf2f47 Mon Sep 17 00:00:00 2001 From: Bruno Haible <[email protected]> Date: Mon, 21 Nov 2011 20:36:43 +0100 Subject: [PATCH] build: fix "make check" error on OSF/1 * tests/Makefile.am (TESTS_ENVIRONMENT): Test the value of the variable BASH_VERSION, not the literal ASH_VERSION. --- tests/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 03ea23b..f23a592 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -106,7 +106,7 @@ TESTS_ENVIRONMENT = \ tmp__=$$TMPDIR; test -d "$$tmp__" || tmp__=.; \ TMPDIR=$$tmp__; export TMPDIR; \ \ - if test -n "$BASH_VERSION" || (eval "export v=x") 2>/dev/null; then \ + if test -n "$$BASH_VERSION" || (eval "export v=x") 2>/dev/null; then \ export_with_values () { export "$$@"; }; \ else \ export_with_values () \ -- 1.7.8.rc2.3.g0911
