[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1954-g85d4143

[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=85d414318eddf5ba4f91fe65bdbf4c4e7cdc6e37

The branch, master has been updated
       via  85d414318eddf5ba4f91fe65bdbf4c4e7cdc6e37 (commit)
       via  ab42f4a402242ee6f2b93a92dc133e7ef664b060 (commit)
       via  22b28b638a2d7d9d05bf7f2741367fc36f8bb8c0 (commit)
       via  a0be183729db528716a92665cf4332d616c132a9 (commit)
       via  ba5a89bec39d85b9033b9a2f7193221b7a2ba3db (commit)
      from  acde2706ea7644f16b2c686ce3c0c8cf95774ff5 (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 85d414318eddf5ba4f91fe65bdbf4c4e7cdc6e37
Author: Stefano Lattarini <address@hidden>
Date:   Thu Feb 16 11:52:55 2012 +0100

    fixup: display captured make stdout in 'tap-signal.tap'

commit ab42f4a402242ee6f2b93a92dc133e7ef664b060
Author: Stefano Lattarini <address@hidden>
Date:   Thu Feb 16 11:31:55 2012 +0100

    tests: avoid spurious failure in 'suffix3.tap'
    
    * tests/suffix3.tap (foo.zoo): This C++ file fails to compile with
    older g++ (3.4.4) on Cygwin 1.5.25 if we #include <iostream>.  Don't
    do that, since it's not strictly required, and the "using namespace"
    directive is already enough to ensure the file contents is valid C++
    but invalid C.

commit 22b28b638a2d7d9d05bf7f2741367fc36f8bb8c0
Author: Stefano Lattarini <address@hidden>
Date:   Thu Feb 16 11:09:50 2012 +0100

    docs: fix typo in description of AM_YFLAGS
    
    Report by Akim Demaille.
    
    * doc/automake.texi (Program variables): Don't list "-d -t" twice
    in the examples of valid ways to specify the '-d' flag to Yacc;
    instead, use "-d -t" and "-t -d".  Add missing period.

commit a0be183729db528716a92665cf4332d616c132a9
Author: Stefano Lattarini <address@hidden>
Date:   Thu Feb 16 11:04:50 2012 +0100

    tests: another spurious failure with older autoconf fixed
    
    * tests/aclocal8.test (configure.in): Also call 'AC_INIT', it's
    required by some older autoconf versions (e.g., 2.63).
    * tests/acloca15.test: Likewise.  Add trailing ':' command since
    we are at it.

commit ba5a89bec39d85b9033b9a2f7193221b7a2ba3db
Author: Stefano Lattarini <address@hidden>
Date:   Thu Feb 16 10:58:03 2012 +0100

    tests: fix spurious failure with older autoconf
    
    * tests/conffile-leading-dot.test: Relax grepping of 'config.status'
    stderr, to cater for older autoconf.  Issue revealed by a failure
    with autoconf 2.63 on Cygwin 1.5.25.

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

Summary of changes:
 doc/automake.texi               |    2 +-
 tests/acloca15.test             |    3 +++
 tests/aclocal8.test             |    1 +
 tests/conffile-leading-dot.test |    2 +-
 tests/suffix3.tap               |    1 -
 tests/tap-signal.tap            |    1 +
 6 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/automake.texi b/doc/automake.texi
index da134ef..8b1a84b 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -6209,7 +6209,7 @@ adjust its rules to update and distribute the header file 
built by
 @option{-d} in @code{AM_YFLAGS} only if it is not clustered with other
 options; for example, it won't be recognized if @code{AM_YFLAGS} is
 @option{-dt}, but it will be if @code{AM_YFLAGS} is @option{-d -t} or
address@hidden -t}}.
address@hidden -d}.}.
 What Automake cannot guess, though, is where this
 header will be used: it is up to you to ensure the header gets built
 before it is first used.  Typically this is necessary in order for
diff --git a/tests/acloca15.test b/tests/acloca15.test
index fcdda52..988bb0c 100755
--- a/tests/acloca15.test
+++ b/tests/acloca15.test
@@ -24,6 +24,7 @@ am_create_testdir=empty
 # cannot find them.
 
 cat > configure.in << 'END'
+AC_INIT
 m4_include([somedef.m4])
 AC_DEFUN([AM_SOME_MACRO])
 AC_DEFUN([AM_SOME_OTHER_MACRO])
@@ -42,3 +43,5 @@ $FGREP AM_SOME_MACRO aclocal.m4 && Exit 1
 $FGREP AM_MORE_MACRO aclocal.m4 && Exit 1
 $FGREP 'm4_include([m4/more.m4])' aclocal.m4
 test 1 = `grep m4_include aclocal.m4 | wc -l`
+
+:
diff --git a/tests/aclocal8.test b/tests/aclocal8.test
index c938c1e..bb42d80 100755
--- a/tests/aclocal8.test
+++ b/tests/aclocal8.test
@@ -20,6 +20,7 @@ am_create_testdir=empty
 . ./defs || Exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 SOME_DEFS
 END
 
diff --git a/tests/conffile-leading-dot.test b/tests/conffile-leading-dot.test
index 382124e..bfe81b5 100755
--- a/tests/conffile-leading-dot.test
+++ b/tests/conffile-leading-dot.test
@@ -55,6 +55,6 @@ echo foo = bazbazbaz > Makefile.am
 # giving a bogus warning.
 $MAKE 2>stderr && { cat stderr >&2 Exit 1; }
 cat stderr >&2
-grep "config\\.status:.*invalid argument.*[\`\"']Makefile[\`\"']" stderr
+grep "config\\.status:.*invalid argument.*Makefile" stderr
 
 :
diff --git a/tests/suffix3.tap b/tests/suffix3.tap
index 092ea9f..3613480 100755
--- a/tests/suffix3.tap
+++ b/tests/suffix3.tap
@@ -56,7 +56,6 @@ command_ok_ "configure" ./configure
 
 # This is deliberately valid C++, but invalid C.
 cat > foo.zoo <<'END'
-#include <iostream>
 using namespace std;
 INTEGER main (void)
 {
diff --git a/tests/tap-signal.tap b/tests/tap-signal.tap
index d32c45c..fb4e9ba 100755
--- a/tests/tap-signal.tap
+++ b/tests/tap-signal.tap
@@ -101,6 +101,7 @@ signal_caught ()
 command_ok_ '"make check" fails' eval '
   (
     st=0; $MAKE check >stdout || st=$?
+    cat stdout
     # Extra "echo" and silencing of xtraces required to avoid possible
     # garbled output with NetBSD make, which would miss some final
     # newlines in the expected places and thus mess up our TAP output.


hooks/post-receive
-- 
GNU Automake