* tests/cxxnoc.test: Adjust grep pattern for CC, because CVS

Autoconf currently defines a CCC variable.

diff --git a/ChangeLog b/ChangeLog
index 2a5a0b9b6661e47c25d52ba8644d31a388d80852..721ed4a07870d8701682aa1942b286472cc48345 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-05-14  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * tests/cxxnoc.test: Adjust grep pattern for CC, because CVS
+       Autoconf currently defines a CCC variable.
+
        * tests/output11.test, tests/output12.test: Use rm -f.
 
 2005-04-25  Gary V. Vaughan  <gary@gnu.org>

diff --git a/tests/cxxnoc.test b/tests/cxxnoc.test
index d0c18687db2e59ae19a9a8a8dce6bb9d641b4cd8..e9dbc78edcba0f2056bb89244ba63cd704525590 100755 (executable)
--- a/tests/cxxnoc.test
+++ b/tests/cxxnoc.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 2001, 2002, 2005  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -22,6 +22,8 @@
 
 . ./defs || exit 1
 
+set -e
+
 cat >> configure.in << 'END'
 AC_PROG_CXX
 END
@@ -34,8 +36,8 @@ END
 : > doe.C
 : > jane.C
 
-$ACLOCAL || exit 1
-$AUTOMAKE || exit 1
+$ACLOCAL
+$AUTOMAKE
 
-grep CC Makefile.in | grep -v MKDEP && exit 1
+$FGREP '(CC)' Makefile.in && exit 1
 exit 0