[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-74-g8f39dca

[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=8f39dca4e9ffb9fae535c0ab6bda4192832f6e70

The branch, branch-1.11 has been updated
       via  8f39dca4e9ffb9fae535c0ab6bda4192832f6e70 (commit)
       via  4f1334cfd89878c1dc0eb9fd01d4ca08543ade9a (commit)
       via  2a76de290642486273507e6924c43c65ca7fe0c5 (commit)
       via  a40eb1403710a195e93ea954468788b77d31f68b (commit)
       via  d137a68c3c38a896d62ed6c5725c705b82f6b5d6 (commit)
       via  c95cff68735bfe3be55934a6f172eb89ab3d07d0 (commit)
       via  5eb0bf21fba328450fbf41d19ed2e592ba4506f2 (commit)
       via  4296aecdd1d65ca2be00e7359acd507df5633370 (commit)
      from  8f4f752533733ab5baabda4bb827d46ff97b9141 (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 8f39dca4e9ffb9fae535c0ab6bda4192832f6e70
Merge: 8f4f752533733ab5baabda4bb827d46ff97b9141 
4f1334cfd89878c1dc0eb9fd01d4ca08543ade9a
Author: Ralf Wildenhues <address@hidden>
Date:   Sun May 23 14:29:48 2010 +0200

    Merge branch 'maint' into branch-1.11

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

Summary of changes:
 ChangeLog            |   29 +++++++++++++++++++++++++++--
 Makefile.am          |    3 ++-
 Makefile.in          |    3 ++-
 doc/automake.texi    |    5 +++++
 tests/configure.test |    7 +++++++
 tests/conflnk3.test  |   39 +++++++++++++++++----------------------
 tests/dejagnu7.test  |    6 ++++--
 tests/extra10.test   |    1 +
 tests/extra11.test   |    1 +
 tests/extra12.test   |    1 +
 10 files changed, 67 insertions(+), 28 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 72c74ce..e812e51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2010-05-23  Ralf Wildenhues  <address@hidden>
+
+       Fix unportable sed script in maintainer-check test.
+       * Makefile.am (sc_tests_Exit_not_exit): Rewrite sed script to
+       not contain semicolon after 'b' or brace commands, for NetBSD.
+
+       Wildcards are not portable to NetBSD make.
+       * doc/automake.texi (Wildcards): Document portability issue.
+       * tests/extra10.test, tests/extra11.test, tests/extra12.test:
+       Require GNU make.
+
+2010-05-23  Stefano Lattarini  <address@hidden>
+
+       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.
+
+       Avoid possible false negatives in dejagnu7.test.
+       * tests/dejagnu7.test: Enable shell `errexit' flag.  Also, avoid
+       unportable use of fgrep option `-e'.
+
+       * tests/conflnk3.test: Use `test -r FILE' and `test ! -r FILE'
+       instead of respectively `test -e FILE' and `test ! -e FILE',
+       since Solaris Sh doesn't grok the latter.  Do not SKIP the test
+       if the shell doesn't support `test -e'.
+
 2010-04-25  Ralf Wildenhues  <address@hidden>
 
        Fix typo in manual.
@@ -8,7 +34,7 @@
        * 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>
+2010-04-25  Stefano Lattarini  <address@hidden>
 
        Minor improvements in comments of test `silent3.test'.
        * tests/silent3.test: Tell to keep it in sync with `silent9.test'
@@ -98,7 +124,6 @@
 2010-04-11  Stefano Lattarini  <address@hidden>
 
        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 Solaris/Heirloom Sh.
diff --git a/Makefile.am b/Makefile.am
index c487874..bbcc882 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -323,7 +323,8 @@ sc_tests_here_document_format:
 ## Ignore comments, and ignore one perl line in ext2.test.
 sc_tests_Exit_not_exit:
        @found=false; for file in $(srcdir)/tests/*.test; do \
-         res=`sed -n '/^#/d; /^\$$PERL/d; /<<.*END/,/^END/{b;}; 
/<<.*EOF/,/^EOF/{b;}; /exit [$$0-9]/p' $$file`; \
+         res=`sed -n -e '/^#/d; /^\$$PERL/d' -e '/<<.*END/,/^END/b' \
+                     -e '/<<.*EOF/,/^EOF/b' -e '/exit [$$0-9]/p' $$file`; \
          if test -n "$$res"; then \
            echo "$$file:$$res"; \
            found=true; \
diff --git a/Makefile.in b/Makefile.in
index 0ce37fe..02b170a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1016,7 +1016,8 @@ sc_tests_here_document_format:
 
 sc_tests_Exit_not_exit:
        @found=false; for file in $(srcdir)/tests/*.test; do \
-         res=`sed -n '/^#/d; /^\$$PERL/d; /<<.*END/,/^END/{b;}; 
/<<.*EOF/,/^EOF/{b;}; /exit [$$0-9]/p' $$file`; \
+         res=`sed -n -e '/^#/d; /^\$$PERL/d' -e '/<<.*END/,/^END/b' \
+                     -e '/<<.*EOF/,/^EOF/b' -e '/exit [$$0-9]/p' $$file`; \
          if test -n "$$res"; then \
            echo "$$file:$$res"; \
            found=true; \
diff --git a/doc/automake.texi b/doc/automake.texi
index 5d845ec..3a1415b 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -10624,6 +10624,11 @@ even though a file is missing. By listing files, 
@samp{make dist}
 @emph{will} complain.
 
 @item
+Wildcards are not portable to some non-GNU @command{make} implementations,
+e.g., NetBSD @command{make} will not expand globs such as @samp{*} in
+prerequisites of a target.
+
address@hidden
 Finally, it's really hard to @emph{forget} to add a file to
 @file{Makefile.am}: files that are not listed in @file{Makefile.am} are
 not compiled or installed, so you can't even test them.
diff --git a/tests/configure.test b/tests/configure.test
index 50a034f..f7ee977 100755
--- a/tests/configure.test
+++ b/tests/configure.test
@@ -35,6 +35,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/conflnk3.test b/tests/conflnk3.test
index 6dfbe1b..00e9da2 100755
--- a/tests/conflnk3.test
+++ b/tests/conflnk3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 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
@@ -21,22 +21,17 @@
 
 set -e
 
-# Skip platforms where `test -e' does not work.  (Note that Changing
-# all `test -e' into `test -h' will not work when AC_CONFIG_LINKS
-# copies or hardlinks files.)
-(test -e configure.in) >/dev/null 2>&1 || Exit 77
-
 cat > Makefile.am << 'END'
 SUBDIRS = sdir
 test: distdir
-       test ! -e $(distdir)/sdir/dest3
-       test ! -e $(distdir)/sdir/dest2
-       test ! -e $(distdir)/dest3
-       test ! -e $(distdir)/dest2
+       test ! -r $(distdir)/sdir/dest3
+       test ! -r $(distdir)/sdir/dest2
+       test ! -r $(distdir)/dest3
+       test ! -r $(distdir)/dest2
        test -f $(distdir)/src2
 ## src3 cannot be distributed, Automake knows nothing about it
-       test ! -e $(distdir)/sdir/src3
-       test ! -e $(distdir)/src3
+       test ! -r $(distdir)/sdir/src3
+       test ! -r $(distdir)/src3
 END
 
 : > src
@@ -69,20 +64,20 @@ grep my_src_dir Makefile.in && Exit 1
 grep my_dest Makefile.in && Exit 1
 
 ./configure
-test -e sdir/dest2
-test -e sdir/dest3
-test -e dest
-test -e dest4
-test -e dest5
+test -r sdir/dest2
+test -r sdir/dest3
+test -r dest
+test -r dest4
+test -r dest5
 $MAKE test
 
 $MAKE distclean
-test ! -e sdir/dest2
-test ! -e sdir/dest3
-test -e dest  # Should still exist, Automake knows nothing about it.
-test -e dest5 # ditto
+test ! -r sdir/dest2
+test ! -r sdir/dest3
+test -r dest  # Should still exist, Automake knows nothing about it.
+test -r dest5 # ditto
 rm -f dest dest5
-test ! -e dest4
+test ! -r dest4
 
 ## Cannot do the following, because at the time of writing Autoconf
 ## (2.59) does not support AC_CONFIG_LINKS source in the build tree.
diff --git a/tests/dejagnu7.test b/tests/dejagnu7.test
index 9abd428..552c2ca 100755
--- a/tests/dejagnu7.test
+++ b/tests/dejagnu7.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
@@ -20,8 +20,10 @@
 required=runtest
 . ./defs || Exit 1
 
+set -e
+
 # Check whether DejaGnu supports --status
-runtest --help | $FGREP -e --status || Exit 77
+runtest --help | grep '.*--status' || Exit 77
 
 cat > failtcl << 'END'
 #! /bin/sh
diff --git a/tests/extra10.test b/tests/extra10.test
index 16d06a3..7bd6556 100755
--- a/tests/extra10.test
+++ b/tests/extra10.test
@@ -17,6 +17,7 @@
 # Check that wildcards in EXTRA_DIST are honoured.
 # Suggested by observations from Braden McDaniel.
 
+required=GNUmake
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/extra11.test b/tests/extra11.test
index 14dda42..a0c55ca 100755
--- a/tests/extra11.test
+++ b/tests/extra11.test
@@ -17,6 +17,7 @@
 # Check for more complex usage of wildcards in EXTRA_DIST.
 # Suggested by observations from Braden McDaniel.
 
+required=GNUmake
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/extra12.test b/tests/extra12.test
index 72b918c..db3bcc7 100755
--- a/tests/extra12.test
+++ b/tests/extra12.test
@@ -18,6 +18,7 @@
 # $srcdir != $builddir, if properly declared.
 # Suggested by observations from Braden McDaniel.
 
+required=GNUmake
 . ./defs || Exit 1
 
 set -e


hooks/post-receive
-- 
GNU Automake