[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-57-g571641b

[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=571641bffcc9348a792dec5b618c8c0a29291d65

The branch, branch-1.11 has been updated
       via  571641bffcc9348a792dec5b618c8c0a29291d65 (commit)
       via  53ac1719ca6b8ecaf1b64176ec72905432a7d8f4 (commit)
       via  3645d214c9c8afe4e7228bdd69f2eceddfaa1473 (commit)
       via  fc65cea6639c0650e8ed178ff058fa56001fd1c8 (commit)
       via  74be0c27243c26ffd2a231ec8bbedea5f22a2eed (commit)
       via  85aee474d93028a91c1cd69632845c75a427edf6 (commit)
       via  17435f54b5194d75bc8310b6fad19832dad13bf0 (commit)
       via  3dd1cc65b3e405d45a26b868879f5fc4ed2e84d8 (commit)
      from  4f76279cd68efb7afb93f2df860d84655ca8ad21 (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 571641bffcc9348a792dec5b618c8c0a29291d65
Merge: 4f76279cd68efb7afb93f2df860d84655ca8ad21 
53ac1719ca6b8ecaf1b64176ec72905432a7d8f4
Author: Ralf Wildenhues <address@hidden>
Date:   Tue Apr 20 07:44:49 2010 +0200

    Merge branch 'maint' into branch-1.11

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

Summary of changes:
 ChangeLog                         |   53 ++++++++++++++++++++++++++++++++----
 lib/Automake/Channels.pm          |    2 +-
 lib/Automake/Variable.pm          |    5 +++-
 tests/Makefile.am                 |    2 +
 tests/Makefile.in                 |    3 ++
 tests/canon-name.test             |    7 +++-
 tests/color.test                  |   22 +++------------
 tests/{color.test => color2.test} |   31 ++++++++++++++-------
 tests/confh5.test                 |    6 +++-
 tests/configure.test              |   51 +++++++++++++++++++++++++++++++++++
 10 files changed, 142 insertions(+), 40 deletions(-)
 copy tests/{color.test => color2.test} (75%)
 create mode 100755 tests/configure.test

diff --git a/ChangeLog b/ChangeLog
index ab9ea61..fd39ff2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+2010-04-20  Ralf Wildenhues  <address@hidden>
+
+       Fix -Werror handling for presence of configure.in and configure.ac.
+       * lib/Automake/Variable.pm (Automake::Variable): Do not initialize
+       $configure_ac at the global level, before command-line arguments
+       have been parsed.
+       (require_variables): Initialize it here.
+       * tests/configure.test: New test.
+       * tests/Makefile.am: Update.
+       Report by Stefano Lattarini.
+
+2010-04-20  Stefano Lattarini  <address@hidden>
+
+       Avoid possible false negatives in confh5.test.
+       * tests/confh5.test: Enable shell `errexit' flag, and bumped
+       copyright years.  Due to this change, any unexpected failure
+       in calls to $ACLOCAL, $AUTOMAKE, $AUTOCONF or $AUTOHEADER, or
+       a failure in grepping expected text in output files should now
+       cause the whole test to fail.
+
+2010-04-17  Stefano Lattarini  <address@hidden>
+
+       Fixed typo in POD documentation of Automake::Channels.
+       * lib/Automake/Channels.pm: Fixed typo in POD documentation:
+       @<...> was used instead of C<...>.
+
+2010-04-14  Stefano Lattarini  <address@hidden>
+
+       Refactor tests on Automake TESTS color output.
+       * tests/color.test: Tests using the expect program moved out to...
+       * tests/color2.test: ... this new file.
+       * tests/Makefile.am (TESTS): Extended accordingly.
+
+2010-04-12  Stefano Lattarini  <address@hidden>
+
+       Fix typos in comments in test confh5.test
+       * tests/confh5.test: Fix a couple of typos in comments.
+
+       Avoid possible false negatives in canon-name.test.
+       * tests/canon-name.test: Enable shell `errexit' flag.  Improve
+       test description.
+
 2010-04-11  Ralf Wildenhues  <address@hidden>
 
        Fix per-Makefile.am setting of -Werror.
@@ -14,12 +56,11 @@
 
 2010-04-11  Stefano Lattarini  <address@hidden>
 
-       Avoid possible false negatives in cond46.test.
-       * tests/cond46.test: Enable shell `errexit' flag (and bumped
-       copyright years).  Due to this change, the testcase should now
-       fail on unexpected failures in calls to $ACLOCAL/$AUTOMAKE (whose
-       outcomes were previously unchecked), and on failures in grepping
-       the expected diagnostic in Automake stderr.
+       Bugfix in confh5.test w.r.t. Solaris/Heirloom Sh.
+
+       * 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.
 
        Make test `aclocal3.test' stricter.
        * tests/aclocal3.test: Add call to `set -e'.  Fail if $ACLOCAL
diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm
index 050ba05..b4908c0 100644
--- a/lib/Automake/Channels.pm
+++ b/lib/Automake/Channels.pm
@@ -171,7 +171,7 @@ C<$warnings_are_errors> is set.
 
 The value to update C<$exit_code> with when a fatal or error message
 is emitted.  C<$exit_code> is also updated for warnings output
-when @<$warnings_are_errors> is set.
+when C<$warnings_are_errors> is set.
 
 =item C<file =E<gt> \*STDERR>
 
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index 8a5b568..3261360 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -193,7 +193,7 @@ my %_ac_macro_for_var =
    );
 
 # The name of the configure.ac file.
-my $configure_ac = find_configure_ac;
+my $configure_ac;
 
 # Variables that can be overridden without complaint from -Woverride
 my %_silent_variable_override =
@@ -1132,6 +1132,9 @@ sub require_variables ($$$@)
   my $res = 0;
   $reason .= ' but ' unless $reason eq '';
 
+  $configure_ac = find_configure_ac
+    unless defined $configure_ac;
+
  VARIABLE:
   foreach my $var (@vars)
     {
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 283e06f..bde4102 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -144,6 +144,7 @@ colon5.test \
 colon6.test \
 colon7.test \
 color.test \
+color2.test \
 comment.test \
 comment2.test \
 comment3.test \
@@ -210,6 +211,7 @@ condinc2.test \
 condlib.test \
 condman.test \
 condman2.test \
+configure.test \
 conf2.test \
 confdeps.test \
 conff.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index c3fd9bc..7d7dfac 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -263,6 +263,7 @@ check7-p.test \
 check8-p.test \
 check9-p.test \
 color-p.test \
+color2-p.test \
 comment9-p.test \
 dejagnu-p.test \
 exeext4-p.test \
@@ -381,6 +382,7 @@ colon5.test \
 colon6.test \
 colon7.test \
 color.test \
+color2.test \
 comment.test \
 comment2.test \
 comment3.test \
@@ -447,6 +449,7 @@ condinc2.test \
 condlib.test \
 condman.test \
 condman2.test \
+configure.test \
 conf2.test \
 confdeps.test \
 conff.test \
diff --git a/tests/canon-name.test b/tests/canon-name.test
index 50a4dff..aecda17 100755
--- a/tests/canon-name.test
+++ b/tests/canon-name.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2007  Free Software Foundation, Inc.
+# Copyright (C) 2007, 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
@@ -14,10 +14,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# PR 511: Make sure we warn about AC_CONFIG_FILES([./makefile]).
+# PR 511: Make sure we warn about e.g. AC_CONFIG_FILES([./gmakefile]),
+# as not all make implementations treat `file' and `./file' equally.
 
 . ./defs || Exit 1
 
+set -e
+
 cat > configure.in << 'END'
 AC_INIT([canon-name], [1.0])
 AM_INIT_AUTOMAKE
diff --git a/tests/color.test b/tests/color.test
index 6fa686d..9d86785 100755
--- a/tests/color.test
+++ b/tests/color.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2007, 2008, 2010  Free Software Foundation, Inc.
+# Copyright (C) 2007, 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
@@ -14,7 +14,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/>.
 
-# Test Automake TESTS color output.
+# Test Automake TESTS color output, by forcing it.
+# Keep this in sync with the sister test `color2.test'.
 
 . ./defs || Exit 1
 
@@ -34,7 +35,7 @@ std=''
 # GNU or BSD 'grep -a' works on files, but is not portable.
 case `echo "$std" | grep .` in
   $std) ;;
-  *) Exit 77 ;;
+  *) echo "$me: grep can't parse nonprinting characters" >&2; Exit 77;;
 esac
 
 cat >>configure.in <<END
@@ -93,21 +94,6 @@ test_no_color ()
   :
 }
 
-cat >expect-make <<'END'
-#! /usr/bin/expect -f
-spawn $env(MAKE) -e check
-expect eof
-END
-
 AM_COLOR_TESTS=always $MAKE -e check >stdout && { cat stdout; Exit 1; }
 cat stdout
 test_color
-
-MAKE=$MAKE expect -f expect-make >stdout || { cat stdout; Exit 77; }
-cat stdout
-test_color
-
-AM_COLOR_TESTS=no MAKE=$MAKE expect -f expect-make >stdout || { cat stdout; 
Exit 77; }
-cat stdout
-test_no_color
-:
diff --git a/tests/color.test b/tests/color2.test
similarity index 75%
copy from tests/color.test
copy to tests/color2.test
index 6fa686d..eedd37d 100755
--- a/tests/color.test
+++ b/tests/color2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2007, 2008, 2010  Free Software Foundation, Inc.
+# Copyright (C) 2007, 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
@@ -14,7 +14,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/>.
 
-# Test Automake TESTS color output.
+# Test Automake TESTS color output, using the expect(1) program.
+# Keep this in sync with the sister test `color.test'.
 
 . ./defs || Exit 1
 
@@ -34,9 +35,22 @@ std=''
 # GNU or BSD 'grep -a' works on files, but is not portable.
 case `echo "$std" | grep .` in
   $std) ;;
-  *) Exit 77 ;;
+  *) echo "$me: grep can't parse nonprinting characters" >&2; Exit 77;;
 esac
 
+# Check that we have a working expect program.
+cat >expect-check <<'END'
+#! /usr/bin/expect -f
+spawn $env(THE_SYSTEM_SHELL) -c :
+expect eof
+END
+THE_SYSTEM_SHELL=/bin/sh expect -f expect-check || {
+    echo "$me: failed to find a working expect program" >&2
+    Exit 77
+}
+
+# Do the tests.
+
 cat >>configure.in <<END
 AC_OUTPUT
 END
@@ -99,15 +113,12 @@ spawn $env(MAKE) -e check
 expect eof
 END
 
-AM_COLOR_TESTS=always $MAKE -e check >stdout && { cat stdout; Exit 1; }
-cat stdout
-test_color
-
-MAKE=$MAKE expect -f expect-make >stdout || { cat stdout; Exit 77; }
+MAKE=$MAKE expect -f expect-make >stdout \
+  || { cat stdout; Exit 1; }
 cat stdout
 test_color
 
-AM_COLOR_TESTS=no MAKE=$MAKE expect -f expect-make >stdout || { cat stdout; 
Exit 77; }
+AM_COLOR_TESTS=no MAKE=$MAKE expect -f expect-make >stdout \
+  || { cat stdout; Exit 1; }
 cat stdout
 test_no_color
-:
diff --git a/tests/confh5.test b/tests/confh5.test
index 52a3054..febe000 100755
--- a/tests/confh5.test
+++ b/tests/confh5.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 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,6 +18,8 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat >> configure.in << 'END'
 AC_SUBST([FOO], [name])
 AC_CONFIG_FILES(include/config.h.in)
@@ -30,7 +32,7 @@ cat > Makefile.am << 'END'
 test: distdir
        test -f $(distdir)/config.h.in
        test -f $(distdir)/include/config.h.in.in
-       : # Solarish Sh do not support 'test -e'
+       : # Solaris Sh does not support 'test -e'
        test ! -f $(distdir)/include/config.h.in
        test ! -r $(distdir)/include/config.h.in
 END
diff --git a/tests/configure.test b/tests/configure.test
new file mode 100755
index 0000000..4b0f28d
--- /dev/null
+++ b/tests/configure.test
@@ -0,0 +1,51 @@
+#! /bin/sh
+# Copyright (C) 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Diagnose if both configure.in and configure.ac are present, prefer
+# configure.ac.
+
+. ./defs || Exit 1
+
+set -e
+
+cat >configure.ac <<\EOF
+AC_INIT
+AM_INIT_AUTOMAKE([configure], [1.0])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+EOF
+
+: >Makefile.am
+
+$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'configure.ac.*configure.in.*both present' stderr
+
+$ACLOCAL -Wno-error 2>stderr
+cat stderr >&2
+grep 'configure.ac.*configure.in.*both present' stderr
+grep 'proceeding.*configure.ac' stderr
+
+# Ensure we really proceed with configure.ac.
+AUTOMAKE_fails -Werror
+grep 'configure.ac.*configure.in.*both present' stderr
+grep 'proceeding.*configure.ac' stderr
+
+AUTOMAKE_run 0 -Wno-error
+grep 'configure.ac.*configure.in.*both present' stderr
+grep 'proceeding.*configure.ac' stderr
+
+:


hooks/post-receive
-- 
GNU Automake