[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1781-g98763f1

[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=98763f1508a86d98b8891ae422dc20315b3a3cbb

The branch, master has been updated
       via  98763f1508a86d98b8891ae422dc20315b3a3cbb (commit)
       via  bc940cb035d1ab2eac1b3c353c0516516c145b79 (commit)
       via  3a422887c20556cc9f5e4a856c046f336f2997b4 (commit)
       via  b08103fedac9fbdf0a24f9192a901ea4b01e45af (commit)
       via  d266b5f7fb2fbb7fddb5b8515d57c32b45a50c67 (commit)
       via  8ddff1004c14bf94d9bcaf1c3b2a29da58e7adf7 (commit)
      from  8557c8a78b64243b8f64122e8e1b1f8bd72265a0 (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 98763f1508a86d98b8891ae422dc20315b3a3cbb
Author: Stefano Lattarini <address@hidden>
Date:   Sun Jan 22 17:59:46 2012 +0100

    tests: remove redundant 'set -e' calls
    
    * tests/aclocal-install-absdir.test: Do not set the 'errexit' shell
    flag, as it is already set by 'tests/defs'.
    * tests/distcheck-pr10470.test: Likewise.
    * tests/objext-pr10128.test: Likewise.
    * tests/parallel-tests-dry-run-1.test: Likewise.
    * tests/silent-nested-vars.test: Likewise.
    * tests/tar-override.test: Likewise.
    * tests/vala-mix.test: Likewise.
    * tests/vala-vpath.test: Likewise.

commit bc940cb035d1ab2eac1b3c353c0516516c145b79
Merge: 8557c8a 3a42288
Author: Stefano Lattarini <address@hidden>
Date:   Sun Jan 22 17:46:53 2012 +0100

    Merge branch 'maint'
    
    * maint:
      tests: fix spurious failure due to autom4te caching
      vala: fix name of temporary file used in vala rules
      vala tests: add missing 'valac' requirement, and other minor fixlets
      news: fix grammaro

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

Summary of changes:
 NEWS                                |    2 +-
 automake.in                         |    4 ++--
 tests/aclocal-install-absdir.test   |    4 +---
 tests/distcheck-pr10470.test        |    2 --
 tests/lzma.test                     |    5 +++--
 tests/objext-pr10128.test           |    2 --
 tests/parallel-tests-dry-run-1.test |    2 --
 tests/silent-nested-vars.test       |    4 +---
 tests/tar-override.test             |    4 +---
 tests/vala-mix.test                 |    7 +++----
 tests/vala-vpath.test               |    2 --
 tests/vala.test                     |    5 +++++
 12 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/NEWS b/NEWS
index 5145357..03ad438 100644
--- a/NEWS
+++ b/NEWS
@@ -192,7 +192,7 @@ New in 1.11.2a:
   - The master copy of the `gnupload' script is now maintained in gnulib,
     not in automake.
 
-  - The `missing' script don't try to wrap calls to `tar' anymore.
+  - The `missing' script doesn't try to wrap calls to `tar' anymore.
 
   - "make dist" doesn't wrap `tar' invocations with the `missing' script
     anymore.  Similarly, the obsolescent variable `$(AMTAR)' (which you
diff --git a/automake.in b/automake.in
index df50238..160210c 100644
--- a/automake.in
+++ b/automake.in
@@ -5907,9 +5907,9 @@ sub lang_vala_finish_target ($$)
 # especially important on systems with sub-second timestamp resolution).
 # Thus we need to create the stamp file *before* invoking valac, and to
 # move it to its final location only after valac has been invoked.
-    "\t${silent}rm -f \$@ && echo stamp > address@hidden".
+    "\t${silent}rm -f \$\@ && echo stamp > address@hidden".
     "\t${verbose}\$(am__cd) \$(srcdir) && ${compile} \$(${derived}_SOURCES)\n".
-    "\t${silent}mv -f address@hidden address@hidden";
+    "\t${silent}mv -f address@hidden address@hidden";
 
   push_dist_common ("${derived}_vala.stamp");
 
diff --git a/tests/aclocal-install-absdir.test 
b/tests/aclocal-install-absdir.test
index 1a642b5..64d9b62 100755
--- a/tests/aclocal-install-absdir.test
+++ b/tests/aclocal-install-absdir.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011, 2012 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,8 +21,6 @@
 
 . ./defs || Exit 1
 
-set -e
-
 mkdir loc sys
 
 echo 'AM_DUMMY_MACRO' >> configure.in
diff --git a/tests/distcheck-pr10470.test b/tests/distcheck-pr10470.test
index d3e4839..5e90d0a 100755
--- a/tests/distcheck-pr10470.test
+++ b/tests/distcheck-pr10470.test
@@ -22,8 +22,6 @@
 am_parallel_tests=no
 . ./defs || Exit 1
 
-set -e
-
 mkdir foo.d
 sh -c "cd foo.d && sleep '4'" &
 # Without this sleep, the "rm -rf foo.d" below would reliably beat
diff --git a/tests/lzma.test b/tests/lzma.test
index 28b4198..f0c284b 100755
--- a/tests/lzma.test
+++ b/tests/lzma.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003, 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2007, 2011, 2012 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,7 +33,8 @@ AC_OUTPUT
 END
 : > Makefile.am
 
-$ACLOCAL --force
+rm -rf autom4te*.cache
+$ACLOCAL
 AUTOMAKE_fails -Wnone -Wno-error
 grep "^configure\\.in:2:.*$errmsg" stderr
 
diff --git a/tests/objext-pr10128.test b/tests/objext-pr10128.test
index 0692164..120986c 100755
--- a/tests/objext-pr10128.test
+++ b/tests/objext-pr10128.test
@@ -19,8 +19,6 @@
 
 . ./defs || Exit 1
 
-set -e
-
 echo AC_OUTPUT >> configure.in
 
 cat > Makefile.am <<'END'
diff --git a/tests/parallel-tests-dry-run-1.test 
b/tests/parallel-tests-dry-run-1.test
index b0f94e5..4ed59f0 100755
--- a/tests/parallel-tests-dry-run-1.test
+++ b/tests/parallel-tests-dry-run-1.test
@@ -20,8 +20,6 @@
 am_parallel_tests=yes
 . ./defs || Exit 1
 
-set -e
-
 echo AC_OUTPUT >> configure.in
 
 cat > Makefile.am <<'END'
diff --git a/tests/silent-nested-vars.test b/tests/silent-nested-vars.test
index 0024b5d..4e5d73e 100755
--- a/tests/silent-nested-vars.test
+++ b/tests/silent-nested-vars.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011, 2012 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
@@ -19,8 +19,6 @@
 
 . ./defs || Exit 1
 
-set -e
-
 cat >>configure.in <<'EOF'
 AM_SILENT_RULES
 AC_PROG_CC
diff --git a/tests/tar-override.test b/tests/tar-override.test
index b08c9f8..3dd4180 100755
--- a/tests/tar-override.test
+++ b/tests/tar-override.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011, 2012 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,8 +21,6 @@
 
 . ./defs || Exit 1
 
-set -e
-
 cwd=`pwd` || fatal_ "couldn't get current working directory"
 
 echo AC_OUTPUT >> configure.in
diff --git a/tests/vala-mix.test b/tests/vala-mix.test
index f597a7f..b1d1baf 100755
--- a/tests/vala-mix.test
+++ b/tests/vala-mix.test
@@ -16,11 +16,9 @@
 
 # Vala sources and C sources in the same program.  Functional test.
 
-required='cc GNUmake'
+required='valac cc GNUmake'
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.in <<'END'
 AC_PROG_CC
 AM_PROG_CC_C_O
@@ -96,8 +94,9 @@ have_generated_files ()
 # C files.
 have_generated_files
 
+# Remake rules are not uselessly triggered.
 $MAKE -q
-$MAKE -n | grep stamp && Exit 1
+$MAKE -n | $FGREP vala.stamp && Exit 1
 
 # Check the distribution.
 $MAKE distcheck
diff --git a/tests/vala-vpath.test b/tests/vala-vpath.test
index 8f2b677..c878c86 100755
--- a/tests/vala-vpath.test
+++ b/tests/vala-vpath.test
@@ -20,8 +20,6 @@
 required="valac GNUmake"
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.in << 'END'
 AC_CONFIG_SRCDIR([hello.vala])
 AC_PROG_CC
diff --git a/tests/vala.test b/tests/vala.test
index e1d2676..d027a6d 100755
--- a/tests/vala.test
+++ b/tests/vala.test
@@ -79,4 +79,9 @@ $FGREP 'baz.c' sub/Makefile.in
 $FGREP 'foo_vala.stamp:' sub/Makefile.in
 test `$FGREP -c '.stamp:' sub/Makefile.in` -eq 1
 
+# Check against regression for weird bug due to unescaped '@'
+# characters used in a "..." perl string when writing the vala
+# rules from automake.in.
+grep '\$[0-9][0-9]*t' Makefile.in sub/Makefile.in && Exit 1
+
 :


hooks/post-receive
-- 
GNU Automake