[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-206-g434a335

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=434a335eae0c5300997df46c39218bf133f6b88e

The branch, branch-1.11 has been updated
       via  434a335eae0c5300997df46c39218bf133f6b88e (commit)
       via  77dc6c1bf2dc893a2c393229c2b656668694120e (commit)
       via  1946eadee8f7a342a338048a89161c98e5353ff3 (commit)
       via  4e8b21e113d49633c55004217bd26dab8b5d7401 (commit)
      from  c8459a6bb9689258875afbcdb7913b8911d7eba0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 434a335eae0c5300997df46c39218bf133f6b88e
Merge: c8459a6 77dc6c1
Author: Stefano Lattarini <address@hidden>
Date:   Mon Sep 13 14:58:22 2010 +0200

    Merge branch 'maint' into branch-1.11

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog           |   21 +++++++++++++++++++++
 tests/colon4.test   |   11 ++++++-----
 tests/install2.test |    5 +++--
 tests/lex3.test     |    2 +-
 tests/pr9.test      |    1 -
 5 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 27eafb9..e6472e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+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-09-08  Stefano Lattarini  <address@hidden>
+
+       Do not require "gzip" explicitly in tests.
+       The gzip utility is simply expected to be present on any decent
+       target system for Automake.  So it's pointless to put it in
+       $required.
+       * tests/install2.test ($required): Do not require "gzip".
+       * tests/lex3.test: Likewise.
+       * tests/pr9.test: Likewise.
+       From a suggestion by Ralf Wildenhues.
+
 2010-09-08  Stefano Lattarini  <address@hidden>
 
        Make some `confh*.test' tests more "semantic" (plus tweakings).
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
diff --git a/tests/install2.test b/tests/install2.test
index d1f27fe..3cc71f5 100755
--- a/tests/install2.test
+++ b/tests/install2.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002, 2006  Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2006, 2010 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
@@ -17,8 +18,8 @@
 # Test for bug in `make dist'
 # From Pavel Roskin.
 
-required=gzip
 . ./defs || Exit 1
+
 set -e
 
 cat > configure.in << 'END'
diff --git a/tests/lex3.test b/tests/lex3.test
index 178a54f..c4120cf 100755
--- a/tests/lex3.test
+++ b/tests/lex3.test
@@ -18,7 +18,7 @@
 # Test associated with PR 19.
 # From Matthew D. Langston.
 
-required='gcc gzip flex GNUmake'
+required='gcc flex GNUmake'
 . ./defs || Exit 1
 
 # Ignore user CFLAGS.
diff --git a/tests/pr9.test b/tests/pr9.test
index 4638b52..a2e71d7 100755
--- a/tests/pr9.test
+++ b/tests/pr9.test
@@ -23,7 +23,6 @@
 # ltconfig, ltmain.sh, mdate-sh, missing, and mkinstalldirs.  In fact,
 # the entire `support/' directory is omitted.
 
-required=gzip
 . ./defs || Exit 1
 
 set -e


hooks/post-receive
-- 
GNU Automake