[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-243-g219d3bf

[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=219d3bf74649699272897f51086708454a972186

The branch, master has been updated
       via  219d3bf74649699272897f51086708454a972186 (commit)
       via  f5976391875f8ff34aabbafa55f8e1ee06e9f53f (commit)
       via  0748837f0c719afd6ede870675ab9efa9926fd27 (commit)
       via  676eddf7d7870f65bd8197febb33124dab5fd189 (commit)
       via  175d84c07fca40170ab83ecccbfa7d4b735f3ef9 (commit)
       via  7924a789a6920a14d1c38b37a1ee45c8e5142e6c (commit)
      from  b5a44609007206e061a2336f23f2b0c028466363 (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 219d3bf74649699272897f51086708454a972186
Merge: 676eddf7d7870f65bd8197febb33124dab5fd189 
f5976391875f8ff34aabbafa55f8e1ee06e9f53f
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Jun 13 19:22:27 2010 +0200

    Merge branch 'maint'

commit 676eddf7d7870f65bd8197febb33124dab5fd189
Merge: b5a44609007206e061a2336f23f2b0c028466363 
175d84c07fca40170ab83ecccbfa7d4b735f3ef9
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Jun 13 19:18:52 2010 +0200

    Merge branch 'fix-distcheck'
    
    * fix-distcheck:
      Parallel tests generation: improve comments (tiny change).
      Tests defs: truly get rid of `$am_defs_included' (unused variable)

commit 175d84c07fca40170ab83ecccbfa7d4b735f3ef9
Author: Stefano Lattarini <address@hidden>
Date:   Wed Jun 9 02:57:24 2010 +0200

    Parallel tests generation: improve comments (tiny change).
    
    * tests/Makefile.am ($(parallel_tests)): Added useful comment to
    generated tests.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 7924a789a6920a14d1c38b37a1ee45c8e5142e6c
Author: Stefano Lattarini <address@hidden>
Date:   Wed Jun 9 02:41:24 2010 +0200

    Tests defs: truly get rid of `$am_defs_included' (unused variable)
    
    * tests/defs.in ($am_defs_included): Remove, its now unused.  It
    should have been removed in a previous changeset, but the removal
    was done only partially (oversight).
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog           |   19 +++++++++++++++++++
 tests/Makefile.am   |   24 +++++++++++++-----------
 tests/Makefile.in   |   22 ++++++++++++----------
 tests/defs.in       |    3 ---
 tests/obsolete.test |    5 ++++-
 5 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c4e69a5..b5f1433 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2010-06-13  Stefano Lattarini  <address@hidden>
+
+       Add useful comment in test script obsolete.test.
+       * tests/obsolte.test: Add a comment explaining why we need
+       an indirection in adding $AUTOUPDATE to $required.
+
+       Normalize whitespaces in 'tests/Makefile.am'.
+       * tests/Makefile.am (TESTS): Use only spaces, not tabs, in the
+       definition of this variable.
+
+       Parallel tests generation: improve comments (tiny change).
+       * tests/Makefile.am ($(parallel_tests)): Added useful comment to
+       generated tests.
+
+       Tests defs: truly get rid of `$am_defs_included' (unused variable)
+        * tests/defs.in ($am_defs_included): Remove, its now unused.  It
+       should have been removed in a previous changeset, but the removal
+       was done only partially (oversight).
+
 2010-06-12  Ralf Wildenhues  <address@hidden>
 
        Remove a couple of unneeded conditionals from tests.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7875fc5..2771a66 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -41,6 +41,8 @@ $(parallel_tests): Makefile.am
          echo; \
          echo "# Run the test with Automake's parallel-tests driver enabled."; 
\
          echo 'parallel_tests=yes'; \
+         echo "# In the spirit of VPATH, we prefer a test in the build tree"; \
+         echo "# over one in the source tree."; \
          echo "if test -f \"./$$input\"; then"; \
          echo "  . \"./$$input\""; \
          echo 'else'; \
@@ -51,7 +53,7 @@ $(parallel_tests): Makefile.am
 
 MAINTAINERCLEANFILES = $(parallel_tests)
 
-TESTS =        \
+TESTS = \
 aclibobj.test \
 aclocal.test \
 aclocal3.test \
@@ -339,7 +341,7 @@ flibs.test \
 fn99.test \
 fn99subdir.test \
 fnoc.test \
-fo.test        \
+fo.test \
 forcemiss.test \
 forcemiss2.test \
 fort1.test \
@@ -445,12 +447,12 @@ libtoo10.test \
 libtoo11.test \
 license.test \
 license2.test \
-link_c_cxx.test        \
+link_c_cxx.test \
 link_dist.test \
 link_f90_only.test \
 link_fc.test \
 link_fccxx.test \
-link_fcxx.test \
+link_fcxx.test \
 link_f_only.test \
 link_override.test \
 lisp2.test \
@@ -649,13 +651,13 @@ srcsub.test \
 srcsub2.test \
 space.test \
 specflg.test \
-specflg2.test  \
-specflg3.test  \
-specflg6.test  \
-specflg7.test  \
-specflg8.test  \
-specflg9.test  \
-specflg10.test \
+specflg2.test \
+specflg3.test \
+specflg6.test \
+specflg7.test \
+specflg8.test \
+specflg9.test \
+specflg10.test \
 spell.test \
 spell2.test \
 spell3.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 07f27ed..db53cfb 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -552,7 +552,7 @@ flibs.test \
 fn99.test \
 fn99subdir.test \
 fnoc.test \
-fo.test        \
+fo.test \
 forcemiss.test \
 forcemiss2.test \
 fort1.test \
@@ -658,12 +658,12 @@ libtoo10.test \
 libtoo11.test \
 license.test \
 license2.test \
-link_c_cxx.test        \
+link_c_cxx.test \
 link_dist.test \
 link_f90_only.test \
 link_fc.test \
 link_fccxx.test \
-link_fcxx.test \
+link_fcxx.test \
 link_f_only.test \
 link_override.test \
 lisp2.test \
@@ -862,13 +862,13 @@ srcsub.test \
 srcsub2.test \
 space.test \
 specflg.test \
-specflg2.test  \
-specflg3.test  \
-specflg6.test  \
-specflg7.test  \
-specflg8.test  \
-specflg9.test  \
-specflg10.test \
+specflg2.test \
+specflg3.test \
+specflg6.test \
+specflg7.test \
+specflg8.test \
+specflg9.test \
+specflg10.test \
 spell.test \
 spell2.test \
 spell3.test \
@@ -1402,6 +1402,8 @@ $(parallel_tests): Makefile.am
          echo; \
          echo "# Run the test with Automake's parallel-tests driver enabled."; 
\
          echo 'parallel_tests=yes'; \
+         echo "# In the spirit of VPATH, we prefer a test in the build tree"; \
+         echo "# over one in the source tree."; \
          echo "if test -f \"./$$input\"; then"; \
          echo "  . \"./$$input\""; \
          echo 'else'; \
diff --git a/tests/defs.in b/tests/defs.in
index e00aed5..9bb6333 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -431,9 +431,6 @@ AUTOMAKE_fails ()
   AUTOMAKE_run 1 ${1+"$@"}
 }
 
-# Register that this file has alredy been sourced.
-am_defs_included=yes
-
 # Turn on shell traces.
 set -x
 
diff --git a/tests/obsolete.test b/tests/obsolete.test
index e6601c9..337e4db 100755
--- a/tests/obsolete.test
+++ b/tests/obsolete.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 1996, 2001, 2002, 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
@@ -16,6 +17,8 @@
 
 # Test to make sure obsolete macros can be autoupdated.
 
+# We need the following indirection in case someone exported e.g.
+# AUTOUPDATE='autoupdate --verbose'.
 set x ${AUTOUPDATE-autoupdate}
 required=$2
 . ./defs || Exit 1


hooks/post-receive
-- 
GNU Automake