[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-189-g529421a

[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=529421a033c9937a853ef0a315a57f230c3a3bc4

The branch, maint has been updated
       via  529421a033c9937a853ef0a315a57f230c3a3bc4 (commit)
      from  b268a1f605ba5eb00d15c6e169d535633fa3d39b (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 529421a033c9937a853ef0a315a57f230c3a3bc4
Author: Stefano Lattarini <address@hidden>
Date:   Fri Aug 27 18:25:17 2010 +0200

    Fix bug in test missing6.test.
    
    * tests/missing6.test: Fix the hack used to edit `configure.in',
    to avoid producing a configure script that breaks with shells
    that do not support $LINENO.  Also throw in a couple of cosmetic
    changes.

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

Summary of changes:
 ChangeLog           |    8 ++++++++
 tests/missing6.test |    9 ++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 98011dc..688f4be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-27  Stefano Lattarini  <address@hidden>
+
+       Fix bug in test missing6.test.
+       * tests/missing6.test: Fix the hack used to edit `configure.in',
+       to avoid producing a configure script that breaks with shells
+       that do not support $LINENO.  Also throw in a couple of cosmetic
+       changes.
+
 2010-08-21  Ralf Wildenhues  <address@hidden>
 
        Improve robustness of mdate-sh script.
diff --git a/tests/missing6.test b/tests/missing6.test
index 3994b85..e543697 100755
--- a/tests/missing6.test
+++ b/tests/missing6.test
@@ -22,7 +22,7 @@ set -e
 
 {
   echo 'm4_define([AC_AUTOCONF_VERSION], [9999a])'
-  echo 'm4_define([b], [oops])'
+  echo 'dnl!! m4_define([a], [oops])'
   cat configure.in
   echo AC_OUTPUT
 } >configure.ac
@@ -39,10 +39,9 @@ $AUTOMAKE
 ./configure
 $MAKE
 
-sed 's/\[b\]/[a]/' < configure.ac > configure.tmp
-cmp configure.ac configure.tmp && Exit 1
-
-mv configure.tmp configure.ac
+sed 's/^dnl!! //' < configure.ac > configure.tmp
+cmp configure.ac configure.tmp && Exit 99 # sanity check
+mv -f configure.tmp configure.ac
 
 $MAKE 2>stderr || { cat stderr >&2; Exit 1; }
 cat stderr >&2


hooks/post-receive
-- 
GNU Automake