[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-378-g84944b5

[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=84944b5a28d77624d3fc9788dda700a59021c91a

The branch, branch-1.11 has been updated
       via  84944b5a28d77624d3fc9788dda700a59021c91a (commit)
       via  5bbf66bd78066dfe088a8405e6c1755c3a9ab2ba (commit)
       via  e78436cf58d37d8471da0101407ff71d4fdee901 (commit)
       via  82a10984a75107c2b06f71e69c482bbb0c62f84b (commit)
       via  99847a1220b6f3212e73dca10448297f1fc15f3e (commit)
       via  a937127aa2ed5f831459716f7f922c894e3e4eb2 (commit)
       via  8a6f52db53b56b717c8c8dacf5675330fe973840 (commit)
       via  d66a7c60468a4f098b3248e9a467a278c6c65198 (commit)
       via  ac6764da0c0ad499e51a36db0a818b03b697ef37 (commit)
       via  9ada18be77d81c1e79ac360bb7a57810b2b6f546 (commit)
      from  d414b6fb521e7209136c76f4efe28316c2084d7f (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 84944b5a28d77624d3fc9788dda700a59021c91a
Merge: d414b6f 5bbf66b
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Apr 16 12:49:56 2011 +0200

    Merge branch 'maint' into branch-1.11

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

Summary of changes:
 ChangeLog                           |   44 ++++++++++++++++-
 Makefile.am                         |    2 +-
 Makefile.in                         |    2 +-
 lib/depcomp                         |    4 +-
 tests/Makefile.am                   |    2 +
 tests/Makefile.in                   |    2 +
 tests/defs.in                       |    4 ++
 tests/depcomp10.test                |   15 +++++-
 tests/depcomp9.test                 |    8 ++-
 tests/pr9.test                      |    2 -
 tests/subdir9.test                  |    2 -
 tests/vtexi3.test                   |    2 +
 tests/yacc-dist-nobuild-subdir.test |   93 +++++++++++++++++++++++++++++++++++
 13 files changed, 167 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 tests/depcomp10.test
 create mode 100755 tests/yacc-dist-nobuild-subdir.test

diff --git a/ChangeLog b/ChangeLog
index 9ec4090..4bad641 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+2011-04-16  Jim Meyering  <address@hidden>
+
+       depcomp: correct invalid sed invocation
+       * lib/depcomp: Insert missing -e before '/:$/d'.
+       Otherwise, that use of sed would treat '/:$/d' as a file name.
+
+2011-04-14  Stefano Lattarini  <address@hidden>
+
+       maintainer check: quote literal `$' in Makefile rule
+       * Makefile.am (sc_tests_PATH_SEPARATOR): Escape literal `$'
+       character in double-quoted string.  Fix a bug in which the rule
+       emitted an erroneously empty substring in its error message.
+
+2011-04-12  Stefano Lattarini  <address@hidden>
+
+       coverage: test for automake bug#8485 (known regression)
+       * tests/yacc-dist-nobuild-subdir.test: New test.
+       * tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
+
+2011-04-12  Stefano Lattarini  <address@hidden>
+
+       test defs: define default $distdir (help reducing duplication)
+       * tests/defs.in ($distdir): New variable, might be used in
+       testcases checking distribution-related features.
+       * tests/pr9.test: Use it.
+       * tests/subdir9.test: Likewise.
+       * tests/vtexi3.test: Add comment explaining why we redefine
+       $distdir in this test.
+
+2011-04-11  Stefano Lattarini  <address@hidden>
+
+       depcomp: fix bugs in tests and in the depcomp script
+       * lib/depcomp (gcc): Remove duplicated `-e' from sed invocation.
+       * tests/depcomp10.test: Make it executable.  Fix a blunder that
+       has left part of an intended comment not prefixed by `#', thus
+       causing shell syntax errors.  In this same comment, break a
+       too-long reported error message on multiple lines, for clarity.
+       Add reference to the relevant bug report.  Add a comment which
+       explains why the test result 'skipped' if the first "make" call
+       fails.  Add other useful comments.
+       * tests/depcomp9.test: Slightly improve comments.
+
 2011-04-11  Ralf Wildenhues  <address@hidden>
 
        Fix hp depmode for VPATH builds with GNU make.
@@ -2490,7 +2532,7 @@
 
 -----
 
-Copyright (C) 2010  Free Software Foundation, Inc.
+Copyright (C) 2010, 2011  Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification, are
 permitted provided the copyright notice and this notice are preserved.
diff --git a/Makefile.am b/Makefile.am
index 316619f..6e8b7df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -474,7 +474,7 @@ sc_tests_plain_egrep_fgrep:
 ## Using `:' as a PATH separator is not portable.
 sc_tests_PATH_SEPARATOR:
        @if grep -E '\bPATH=.*:.*' $(srcdir)/tests/*.test ; then \
-         echo "Use \`$$PATH_SEPARATOR', not \`:', in PATH definitions above." 
1>&2; \
+         echo "Use \`\$$PATH_SEPARATOR', not \`:', in PATH definitions above." 
1>&2; \
          exit 1; \
        fi
 
diff --git a/Makefile.in b/Makefile.in
index 24ba0d9..a2d8b09 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1156,7 +1156,7 @@ sc_tests_plain_egrep_fgrep:
 
 sc_tests_PATH_SEPARATOR:
        @if grep -E '\bPATH=.*:.*' $(srcdir)/tests/*.test ; then \
-         echo "Use \`$$PATH_SEPARATOR', not \`:', in PATH definitions above." 
1>&2; \
+         echo "Use \`\$$PATH_SEPARATOR', not \`:', in PATH definitions above." 
1>&2; \
          exit 1; \
        fi
 
diff --git a/lib/depcomp b/lib/depcomp
index e996e5d..2fe40a9 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2011-04-11-05; # UTC
+scriptversion=2011-04-16.09; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2011,
 # Free Software Foundation, Inc.
@@ -162,7 +162,7 @@ gcc)
 ## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e -e "s|.*$object$||" '/:$/d' \
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
       | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4e87805..b91a025 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,6 +22,7 @@ auxdir2.test \
 cond17.test \
 gcj6.test \
 pr8365-remake-timing.test \
+yacc-dist-nobuild-subdir.test \
 txinfo5.test
 
 include $(srcdir)/parallel-tests.am
@@ -831,6 +832,7 @@ yacc8.test \
 yaccdry.test \
 yaccpp.test \
 yaccvpath.test \
+yacc-dist-nobuild-subdir.test \
 yflags.test \
 yflags2.test \
 $(parallel_tests)
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 08b8ea8..371d214 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -278,6 +278,7 @@ auxdir2.test \
 cond17.test \
 gcj6.test \
 pr8365-remake-timing.test \
+yacc-dist-nobuild-subdir.test \
 txinfo5.test
 
 parallel_tests = \
@@ -1101,6 +1102,7 @@ yacc8.test \
 yaccdry.test \
 yaccpp.test \
 yaccvpath.test \
+yacc-dist-nobuild-subdir.test \
 yflags.test \
 yflags2.test \
 $(parallel_tests)
diff --git a/tests/defs.in b/tests/defs.in
index 8aaf108..cf07a4e 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -66,6 +66,10 @@ test -f "$srcdir/defs.in" || {
 
 me=`echo "$0" | sed -e 's,.*[\\/],,;s/\.test$//'`
 
+# This might be used in testcases checking distribution-related features.
+# Test scripts are free to override this if they need to.
+distdir=$me-1.0
+
 APIVERSION='@APIVERSION@'
 PATH_SEPARATOR='@PATH_SEPARATOR@'
 
diff --git a/tests/depcomp10.test b/tests/depcomp10.test
old mode 100644
new mode 100755
index 4fdee40..0fa6c6a
--- a/tests/depcomp10.test
+++ b/tests/depcomp10.test
@@ -16,12 +16,15 @@
 
 # hp depmode should work with GNU make in VPATH mode (bug similar to
 # depcomp9.test).
+# For automake bug#8473.
 
 # Here's the bug: hp depmode will prefix VPATH to the object file name,
 # thus the second gmake will invoke depcomp with object='../../src/foo.o',
-# causing errors such as:
-#   cpp: "", line 0: error 4066: Cannot create 
"../../gllib/.deps/nonblocking.TPo" file for 
"-M../../gllib/.deps/nonblocking.TPo" option. (No such file or dir
-+ectory[errno=2])
+# causing errors such as (broken on multiple lines for clarity):
+#   cpp: "", line 0: error 4066: Cannot create
+#        "../../gllib/.deps/nonblocking.TPo" file for
+#        "-M../../gllib/.deps/nonblocking.TPo" option.
+#        (No such file or directory[errno=2])
 
 required=GNUmake
 . ./defs || Exit 1
@@ -71,7 +74,13 @@ $AUTOMAKE -a
 
 cd build
 ../configure am_cv_CC_dependencies_compiler_type=hp
+# Do not error out with the first make, as the forced 'hp' depmode might
+# not actually work, but we have overridden the _AM_DEPENDENCIES tests.
 $MAKE || Exit 77
+
+# We must clean and rebuild, as the actual error only happens the second
+# time the objects are built because 'depcomp' has silently messed up the
+# .Po files the first time.
 $MAKE clean
 
 $MAKE >out 2>&1 || { cat out; Exit 1; }
diff --git a/tests/depcomp9.test b/tests/depcomp9.test
index d137fad..9972c3d 100755
--- a/tests/depcomp9.test
+++ b/tests/depcomp9.test
@@ -77,10 +77,12 @@ cd build
 
 # Do not error out with the first make, as the forced 'makedepend'
 # depmode might not actually work, but we have overridden the
-# _AM_DEPENDENCIES tests.  The actual error only happens the second time
-# the objects are built, because 'makedepend' has silently messed up the
-# .Po files the first time.
+# _AM_DEPENDENCIES tests.
 $MAKE || Exit 77
+
+# We must clean and rebuild, as the actual error only happens the second
+# time the objects are built because 'makedepend' has silently messed up
+# the .Po files the first time.
 $MAKE clean
 
 $MAKE >out 2>&1 || { cat out; Exit 1; }
diff --git a/tests/pr9.test b/tests/pr9.test
index a2e71d7..1f27f69 100755
--- a/tests/pr9.test
+++ b/tests/pr9.test
@@ -47,8 +47,6 @@ $AUTOMAKE -a -c
 $MAKE
 $MAKE distcheck
 
-distdir=$me-1.0
-
 gzip -d $distdir.tar.gz
 
 tar tf $distdir.tar | $FGREP support
diff --git a/tests/subdir9.test b/tests/subdir9.test
index c73ca18..403a376 100755
--- a/tests/subdir9.test
+++ b/tests/subdir9.test
@@ -43,8 +43,6 @@ cat >src/subdir2/Makefile.am <<'EOF'
 EXTRA_DIST = foo
 EOF
 
-distdir=$me-1.0
-
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE --copy --add-missing
diff --git a/tests/vtexi3.test b/tests/vtexi3.test
index 34f46c5..4b0f45d 100755
--- a/tests/vtexi3.test
+++ b/tests/vtexi3.test
@@ -24,6 +24,8 @@
 
 set -e
 
+# We are going to override package version in AC_INIT, so we need
+# to redefine the name of the distdir as well.
 distdir=$me-7.45.3a
 
 # This should work without tex, texinfo or makeinfo
diff --git a/tests/yacc-dist-nobuild-subdir.test 
b/tests/yacc-dist-nobuild-subdir.test
new file mode 100755
index 0000000..b6811d7
--- /dev/null
+++ b/tests/yacc-dist-nobuild-subdir.test
@@ -0,0 +1,93 @@
+#! /bin/sh
+# Copyright (C) 2011 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/>.
+
+# Check that VPATH builds and "make distcheck" works with packages
+# using yacc and the automake 'subdir-objects' option.
+# Exposes automake bug#8485.
+
+required=yacc
+. ./defs || Exit 1
+
+set -e
+
+distdir=$me-1.0
+
+cat >> configure.in << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+mkdir sub
+
+cat > sub/parse.y << 'END'
+%{
+int yylex () { return 0; }
+void yyerror (char *s) { return; }
+%}
+%%
+x : 'x' {};
+%%
+int main (void)
+{
+  return yyparse ();
+}
+END
+
+cat > Makefile.am <<'END'
+AUTOMAKE_OPTIONS = subdir-objects
+noinst_PROGRAMS = foo bar
+foo_SOURCES = sub/parse.y
+bar_SOURCES = $(foo_SOURCES)
+AM_YFLAGS = -d
+bar_YFLAGS =
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE distdir
+
+# Yacc-derived C source and header files must be built and distributed
+
+test   -f sub/parse.c
+test   -f sub/parse.h
+test   -f sub/bar-parse.c
+test ! -r sub/bar-parse.h
+
+test   -f $distdir/sub/parse.c
+test   -f $distdir/sub/parse.h
+test   -f $distdir/sub/bar-parse.c
+test ! -r $distdir/sub/bar-parse.h
+
+# But they shouldn't be rebuilt in VPATH builds.
+
+mkdir $distdir/build
+chmod -R a-w $distdir
+cd $distdir/build
+chmod u+w .
+# Try to enable dependency tracking even with slow dependency
+# extractors, to improve coverage.
+../configure --enable-dependency-tracking YACC=false
+YACC=false $MAKE -e
+ls -l sub/*.[ch] && Exit 1
+
+env YACC=false DISTCHECK_CONFIGURE_FLAGS='YACC=false' $MAKE -e distcheck
+
+:


hooks/post-receive
-- 
GNU Automake