[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-66-g8f4f752

[Ralf Wildenhues]

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=8f4f752533733ab5baabda4bb827d46ff97b9141

The branch, branch-1.11 has been updated
       via  8f4f752533733ab5baabda4bb827d46ff97b9141 (commit)
       via  bf38d9c52f1bb5606dcbe04e0c8405e4a698af64 (commit)
       via  c3d47d57a548aab53e7627ce8eb81205b35a2245 (commit)
       via  6375de2be497bf31d5e33d1d03580be18e708446 (commit)
       via  76b2ca952f073428010a294f98c9d47ee97eb907 (commit)
       via  891c5b53311ca7b7f079baff3fb9ce52a5371ad7 (commit)
       via  4da4ff7c1791c0113ced4c47cb8457a38f7c6a38 (commit)
       via  20f6bb8f32131eb2da5a24b1f74adc5277143f5b (commit)
       via  c57885b0cf518bfd38f502d9c61b7688044804cc (commit)
      from  571641bffcc9348a792dec5b618c8c0a29291d65 (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 8f4f752533733ab5baabda4bb827d46ff97b9141
Merge: 571641bffcc9348a792dec5b618c8c0a29291d65 
bf38d9c52f1bb5606dcbe04e0c8405e4a698af64
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Apr 25 18:46:40 2010 +0200

    Merge branch 'maint' into branch-1.11

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

Summary of changes:
 ChangeLog            |   43 ++++++++++++++++++++++++++++++++++++++++++-
 automake.in          |    2 +-
 doc/automake.texi    |    2 +-
 tests/acloca14.test  |    3 ++-
 tests/acloca18.test  |    3 ++-
 tests/aclocal.test   |    6 +++++-
 tests/badopt.test    |    8 ++++----
 tests/configure.test |    7 +++++++
 tests/confsub.test   |    8 ++++----
 tests/fort2.test     |    3 ++-
 tests/help.test      |    3 ++-
 tests/missing3.test  |    9 ++++++++-
 tests/missing6.test  |    3 ++-
 tests/silent3.test   |    2 +-
 14 files changed, 83 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fd39ff2..72c74ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+2010-04-25  Ralf Wildenhues  <address@hidden>
+
+       Fix typo in manual.
+       * doc/automake.texi (Simple Tests using parallel-tests): Add
+       missing closing parenthesis.
+
+       Fix leftover call to removed function macros_dump.
+       * automake.in (read_main_am_file): Call variables_dump, not
+       macros_dump.  Print actual error before list of variables.
+
+2010-04-22  Stefano Lattarini  <address@hidden>
+
+       Minor improvements in comments of test `silent3.test'.
+       * tests/silent3.test: Tell to keep it in sync with `silent9.test'
+       too.
+
+2010-04-25  Ralf Wildenhues  <address@hidden>
+
+       testsuite: ensure verbose printing of captured output.
+       * tests/acloca14.test, tests/acloca18.test, tests/aclocal.test,
+       tests/fort2.test, tests/help.test, tests/missing3.test,
+       tests/missing6.test: Print captured stdout or stderr before
+       grepping it.
+
+2010-04-20  Stefano Lattarini  <address@hidden>
+
+       Make test badopt.test stricter (by enabling `set -e').
+       * tests/badopt.test: Add call to `set -e'.  Due to this change,
+       an unexpected failure in the call to `$ACLOCAL' (whose outcome
+       was previously unchecked) would cause the whole test to fail.
+       Also, bumped the copyright years.
+
+       Make test for configure.in vs. configure.ac stricter.
+       * tests/configure.test: Use a configure.in file that provokes
+       an automake error, to ensure configure.ac is preferred.
+
+       Use `set -e' in confsub.test (avoids possible false negatives).
+       * tests/confsub.test: Enable shell `errexit' flag, and related
+       changes (this helps avoiding some possible minor false negatives).
+       Also, bumped copyright years.
+
 2010-04-20  Ralf Wildenhues  <address@hidden>
 
        Fix -Werror handling for presence of configure.in and configure.ac.
@@ -60,7 +101,7 @@
 
        * tests/confh5.test: In the generated Makefile.am: do not use
        `test ! -e FILE' to check for the non-existence of a file, since
-       that is not supported by Solarish/Heirloom Sh.
+       that is not supported by Solaris/Heirloom Sh.
 
        Make test `aclocal3.test' stricter.
        * tests/aclocal3.test: Add call to `set -e'.  Fail if $ACLOCAL
diff --git a/automake.in b/automake.in
index 4825537..b0707d9 100755
--- a/automake.in
+++ b/automake.in
@@ -6949,7 +6949,7 @@ sub read_main_am_file
     my ($amfile) = @_;
 
     # This supports the strange variable tricks we are about to play.
-    prog_error (macros_dump () . "variable defined before read_main_am_file")
+    prog_error ("variable defined before read_main_am_file\n" . variables_dump 
())
       if (scalar (variables) > 0);
 
     # Generate copyright header for generated Makefile.in.
diff --git a/doc/automake.texi b/doc/automake.texi
index b79c448..5d845ec 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -8664,7 +8664,7 @@ set of converted log files.  The log and HTML files are 
removed upon
 @vindex DISABLE_HARD_ERRORS
 @cindex Exit status 99, special interpretation
 @cindex hard error
-Even in the presence of expected failures (see @code{XFAIL_TESTS}, there
+Even in the presence of expected failures (see @code{XFAIL_TESTS}), there
 may be conditions under which a test outcome needs attention.  For
 example, with test-driven development, you may write tests for features
 that you have not implemented yet, and thus mark these tests as expected
diff --git a/tests/acloca14.test b/tests/acloca14.test
index 8ddbb1a..a4e86d7 100755
--- a/tests/acloca14.test
+++ b/tests/acloca14.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2008, 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
@@ -109,4 +109,5 @@ $MAKE testdist2
 # Make sure aclocal diagnose missing included files with correct `file:line:'.
 rm -f b.m4
 $ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep 'a.m4:1:.*b.m4.*does not exist' stderr
diff --git a/tests/acloca18.test b/tests/acloca18.test
index 22feb23..276e5ba 100755
--- a/tests/acloca18.test
+++ b/tests/acloca18.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2005, 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2008, 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
@@ -87,6 +87,7 @@ grep macro23 foo
 ACLOCAL_TESTSUITE_FLAGS='-I 4 -I 1 -I 2'
 rm -f foo
 $ACLOCAL --install 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep AM_MACRO2 stderr
 
 ACLOCAL_TESTSUITE_FLAGS='-I 4 -I 1'
diff --git a/tests/aclocal.test b/tests/aclocal.test
index 6b87a9d..d3437d2 100755
--- a/tests/aclocal.test
+++ b/tests/aclocal.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2004, 2008  Free Software Foundation, Inc.
+# Copyright (C) 1998, 2001, 2002, 2004, 2008, 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
@@ -24,14 +25,17 @@ $ACLOCAL --output=fred
 test -f fred
 
 $ACLOCAL --output 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep 'option.*--output.*an argument' stderr
 grep help stderr
 
 $ACLOCAL --unknown-option 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep 'unrecognized.*--unknown-option' stderr
 grep help stderr
 
 $ACLOCAL --ver 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep 'unrecognized.*--ver' stderr
 grep help stderr
 
diff --git a/tests/badopt.test b/tests/badopt.test
index 59eb5fa..2da53e9 100755
--- a/tests/badopt.test
+++ b/tests/badopt.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1998, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 1998, 2002, 2003, 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
@@ -18,9 +18,9 @@
 
 . ./defs || Exit 1
 
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = zardoz
-END
+set -e
+
+echo 'AUTOMAKE_OPTIONS = zardoz' > Makefile.am
 
 $ACLOCAL
 AUTOMAKE_fails
diff --git a/tests/configure.test b/tests/configure.test
index 4b0f28d..50a034f 100755
--- a/tests/configure.test
+++ b/tests/configure.test
@@ -28,6 +28,13 @@ AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 EOF
 
+cat >configure.in <<EOF
+AC_INIT([configure], [1.0])
+AM_INIT_AUTOMAKE([an-invalid-automake-option])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+EOF
+
 : >Makefile.am
 
 $ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
diff --git a/tests/confsub.test b/tests/confsub.test
index 40c90c5..65ec91b 100755
--- a/tests/confsub.test
+++ b/tests/confsub.test
@@ -1,6 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 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
@@ -20,6 +20,8 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -55,5 +57,3 @@ $sleep
 echo 'After.' > subdir/config.hin
 $MAKE || Exit 1
 $FGREP 'After.' subdir/config.h || Exit 1
-
-Exit 0
diff --git a/tests/fort2.test b/tests/fort2.test
index 3568189..70d13f2 100755
--- a/tests/fort2.test
+++ b/tests/fort2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 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
@@ -48,6 +48,7 @@ $AUTOMAKE
 grep '.\$(LINK)'       Makefile.in && Exit 1
 grep '.\$(FCLINK)'     Makefile.in
 grep '.\$(FCCOMPILE)'  Makefile.in > stdout
+cat stdout
 grep -v '\$(FCFLAGS_f' stdout && Exit 1
 grep '.\$(FC.*\$(FCFLAGS_blabla' Makefile.in && Exit 1
 # Notice the TAB:
diff --git a/tests/help.test b/tests/help.test
index d4d7110..e9ccf62 100755
--- a/tests/help.test
+++ b/tests/help.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2008, 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
@@ -33,6 +33,7 @@ $AUTOMAKE --help
 
 # aclocal and automake cannot work without configure.ac or configure.in
 $ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep configure.ac stderr
 grep configure.in stderr
 AUTOMAKE_fails
diff --git a/tests/missing3.test b/tests/missing3.test
index 07ef779..d3a7823 100755
--- a/tests/missing3.test
+++ b/tests/missing3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2008, 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
@@ -23,23 +23,30 @@ set -e
 # b7cb8259 assumed not to exist.
 
 ./missing b7cb8259 --version 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep . stderr && Exit 1
 ./missing b7cb8259 --grep 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep WARNING stderr
 
 ./missing --run b7cb8259 --version && Exit 1
 ./missing --run b7cb8259 --grep 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep WARNING stderr
 
 # missing itself it known to exist :)
 
 ./missing ./missing --version 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep . stderr && Exit 1
 ./missing ./missing --grep 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep WARNING stderr
 
 ./missing --run ./missing --version 2>stderr
+cat stderr >&2
 grep . stderr && Exit 1
 ./missing --run ./missing --grep 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep WARNING stderr && Exit 1
 grep Unknown stderr
diff --git a/tests/missing6.test b/tests/missing6.test
index b63a0d1..914546b 100755
--- a/tests/missing6.test
+++ b/tests/missing6.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
+# Copyright (C) 2008, 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
@@ -32,6 +32,7 @@ touch Makefile.am
 
 $ACLOCAL
 $AUTOCONF 2>stderr
+cat stderr >&2
 grep 'You have another version of autoconf' stderr
 grep 'aclocal.m4:.*this file was generated for' stderr
 $AUTOMAKE
diff --git a/tests/silent3.test b/tests/silent3.test
index 70023ec..f83d914 100755
--- a/tests/silent3.test
+++ b/tests/silent3.test
@@ -16,7 +16,7 @@
 
 # Check silent-rules mode, with libtool, standard depmode case.
 
-# Please keep this file in sync with silent4.test.
+# Please keep this file in sync with silent4.test and silent9.test.
 
 required=libtoolize
 . ./defs


hooks/post-receive
-- 
GNU Automake