From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 13 Sep 2010 12:50:14 +0000 (+0200)
Subject: Fix regression in test `colon4.test'.
X-Git-Tag: v1.11.1b~53^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1946eadee8f7a342a338048a89161c98e5353ff3;p=thirdparty%2Fautomake.git

Fix regression in test `colon4.test'.

* tests/colon4.test: Fix botched editing to `configure.in'
that made the test useless.  Since we are at it, improve
comments and make grepping of generated Makefile.in slighty
stricter.
Regression introduced by change "Modernize, improve and/or
extend tests `colon*.test" (Stefano Lattarini, 2010-08-08).
---

diff --git a/ChangeLog b/ChangeLog
index eff021293..8142d5dfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	Fix regression in test `colon4.test'.
+	* tests/colon4.test: Fix botched editing to `configure.in'
+	that made the test useless.  Since we are at it, improve
+	comments and make grepping of generated Makefile.in slighty
+	stricter.
+	Regression introduced by change "Modernize, improve and/or
+	extend tests `colon*.test" (Stefano Lattarini, 2010-08-08).
+
 2010-08-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	Modernize, improve and/or extend tests `colon*.test.
diff --git a/tests/colon4.test b/tests/colon4.test
index 97a447914..9af6b4e8b 100755
--- a/tests/colon4.test
+++ b/tests/colon4.test
@@ -15,8 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make sure ":" works with files automake generates.
-# This test is for multiple ":"s.
+# Make sure multiple ":"s in AC_CONFIG_FILES do not generate broken
+# rebuild rules.
 # Test from Maciej W. Rozycki.
 
 . ./defs || Exit 1
@@ -24,7 +24,7 @@
 set -e
 
 cat >> configure.in <<END
-AC_CONFIG_FILES([zardoz:two:three])
+AC_CONFIG_FILES([zardoz:one:two:three])
 AC_OUTPUT
 END
 
@@ -36,6 +36,7 @@ END
 $ACLOCAL
 $AUTOMAKE
 
-# The rule should regenerate the file "zardoz".
-grep '^zardoz:one:two' Makefile.in && Exit 1
+# The rule should regenerate the file "zardoz", not a meaningless
+# file "'zardoz:one:two".
+$FGREP 'zardoz:one:two' Makefile.in && Exit 1
 Exit 0