automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[FYI] Fix regression in test `colon4.test'.


From: Stefano Lattarini
Subject: [FYI] Fix regression in test `colon4.test'.
Date: Mon, 13 Sep 2010 15:14:25 +0200
User-agent: KMail/1.13.3 (Linux/2.6.30-2-686; KDE/4.4.4; i686; ; )

I pushed as obvious the patch below, fixing a regression introduced in
test `colon4.test' (by myself -- sigh!).

I fixed the regression following the route suggeted in HACKING: I created
a seperate temporary branch stemming from the commit that introduced the
regression (f9fe878b53bca8297dbb6df861a99632f2f9b5b3), then I added a commit
correcting the broken test case (1946eadee8f7a342a338048a89161c98e5353ff3),
then I merged the temporary branch to maint, merged maint into master and
branch-1.11, and pushed.

Sorry for the noise,
   Stefano

-*-*-

From 1946eadee8f7a342a338048a89161c98e5353ff3 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Mon, 13 Sep 2010 14:50:14 +0200
Subject: [PATCH] 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).
---
 ChangeLog         |   10 ++++++++++
 tests/colon4.test |   11 ++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eff0212..8142d5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-12  Stefano Lattarini  <address@hidden>
+
+       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  <address@hidden>
 
        Modernize, improve and/or extend tests `colon*.test.
diff --git a/tests/colon4.test b/tests/colon4.test
index 97a4479..9af6b4e 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
-- 
1.7.1




reply via email to

[Prev in Thread] Current Thread [Next in Thread]