[SCM] GNU Automake branch, master, updated. Release-1-10-80-gadde5af

[Akim Demaille]

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=adde5afee18384c94974a380df4f85a372e58df9

The branch, master has been updated
       via  adde5afee18384c94974a380df4f85a372e58df9 (commit)
      from  66027a9bdc9bd3419f5a87e7d50c3ff0f2e920b8 (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 adde5afee18384c94974a380df4f85a372e58df9
Author: Akim Demaille <address@hidden>
Date:   Sun Nov 25 17:43:17 2007 +0100

    Several *-local in a rule do not work.
    
        * tests/all.test: Check this case.
        Use set -e.
        * tests/Makefile.am (XFAIL_TESTS): Add it.
    
    Signed-off-by: Akim Demaille <address@hidden>

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

Summary of changes:
 ChangeLog         |    7 +++++++
 tests/Makefile.am |    6 +++++-
 tests/Makefile.in |    7 ++++++-
 tests/all.test    |   21 +++++++++++++++++----
 4 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 314b2d6..ac528fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2007-11-25  Akim Demaille  <address@hidden>
 
+       Several *-local in a rule do not work.
+       * tests/all.test: Check this case.
+       Use set -e.
+       * tests/Makefile.am (XFAIL_TESTS): Add it.
+
+2007-11-25  Akim Demaille  <address@hidden>
+
        Fix uses of am__strip_dir.
        * lib/am/libs.am, lib/am/ltlib.am: Catch up with the change of
        definition of am__strip_dir.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c4e7fc6..80d3d71 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,10 @@
 ## Process this file with automake to create Makefile.in
 
-XFAIL_TESTS = auxdir2.test cond17.test txinfo5.test
+XFAIL_TESTS =                                  \
+all.test                                       \
+auxdir2.test                                   \
+cond17.test                                    \
+txinfo5.test
 
 TESTS =        \
 aclibobj.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index e5e71ef..3b6a92a 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -149,7 +149,12 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-XFAIL_TESTS = auxdir2.test cond17.test txinfo5.test
+XFAIL_TESTS = \
+all.test                                       \
+auxdir2.test                                   \
+cond17.test                                    \
+txinfo5.test
+
 TESTS = \
 aclibobj.test \
 aclocal.test \
diff --git a/tests/all.test b/tests/all.test
index e9ffb70..a0d749e 100755
--- a/tests/all.test
+++ b/tests/all.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1999, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2007  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -21,14 +21,27 @@
 # Test to make sure all-local and other -local targets work correctly.
 
 . ./defs || exit 1
+set -e
 
-for target in all install-exec install-data uninstall; do
+targets='all install-exec install-data uninstall'
+for target in $targets; do
    echo "Doing $target"
    echo "${target}-local:" > Makefile.am
 
-   $ACLOCAL || exit 1
-$AUTOMAKE || exit 1
+   $ACLOCAL
+   $AUTOMAKE
 
    $FGREP "${target}-local ${target}-local" Makefile.in && exit 1
 done
+
+# Several *-local's in a single rule.
+echo "Doing $targets"
+echo "$targets:" | sed -e 's/[ :]/-local&/g' > Makefile.am
+$ACLOCAL
+$AUTOMAKE
+
+for target in $targets; do
+  $EGREP "${target}-am:.*${target}-local" Makefile.in
+done
+
 exit 0


hooks/post-receive
--
GNU Automake