[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-669-gd905a94

[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=d905a94e6c749821aecc889d08e07c94f5354c40

The branch, master has been updated
       via  d905a94e6c749821aecc889d08e07c94f5354c40 (commit)
       via  7069a8b33278ef1d031a4d25482b3a6767e665b8 (commit)
       via  3474cdc9ff394c7b01db380c4ca2cd42620ff076 (commit)
       via  d652a1c0a5bf2f973c5328eed983b4df9ccd284f (commit)
       via  e8e533e2f5039a34c7c13c9cdd88cfbf0ba2f3ec (commit)
       via  599a8f5ef7241b23ed96b18f32f745d028d26c11 (commit)
      from  50fc82ed3e063bc456c491c074bee905f98bd22e (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 d905a94e6c749821aecc889d08e07c94f5354c40
Merge: 3474cdc 7069a8b
Author: Ralf Wildenhues <address@hidden>
Date:   Wed Jan 19 19:54:41 2011 +0100

    Merge branch 'tests-init'
    
    * tests-init:
      tests: work around Tru64 sh -e issues for instspc*.test.

commit 7069a8b33278ef1d031a4d25482b3a6767e665b8
Author: Ralf Wildenhues <address@hidden>
Date:   Tue Jan 18 22:58:18 2011 +0100

    tests: work around Tru64 sh -e issues for instspc*.test.
    
    Apparently, Tru64 sh does not like turning off errexit mode,
    and gets confused.
    
    * tests/defs: Document 'errexit' cleanliness requirement.
    * tests/defs-static.in: Likewise.  Avoid error from command
    substitution to abort instspc*.test with Tru64/OSF 5.1 sh.
    * tests/instspc-tests.sh: Drop now-unneeded temporary errexit
    dropping.  Add strategic '|| Exit' to let tests work on Tru64.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 3474cdc9ff394c7b01db380c4ca2cd42620ff076
Merge: 50fc82e d652a1c
Author: Ralf Wildenhues <address@hidden>
Date:   Wed Jan 19 19:49:12 2011 +0100

    Merge branch 'maint'

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

Summary of changes:
 ChangeLog                                |   32 ++++++++++++++++++++++++++++++
 m4/depend.m4                             |    5 ++-
 tests/defs                               |    2 +
 tests/defs-static.in                     |    9 +++++--
 tests/instspc-tests.sh                   |   12 ++++------
 tests/parallel-tests-unreadable-log.test |    1 +
 tests/spy.test                           |   14 +++++++++++-
 7 files changed, 61 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 80a51b6..5282a31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2011-01-19  Ralf Wildenhues  <address@hidden>
+
+       tests: work around Tru64 sh -e issues for instspc*.test.
+       Apparently, Tru64 sh does not like turning off errexit mode,
+       and gets confused.
+       * tests/defs: Document 'errexit' cleanliness requirement.
+       * tests/defs-static.in: Likewise.  Avoid error from command
+       substitution to abort instspc*.test with Tru64/OSF 5.1 sh.
+       * tests/instspc-tests.sh: Drop now-unneeded temporary errexit
+       dropping.  Add strategic '|| Exit' to let tests work on Tru64.
+
+2011-01-19  Ralf Wildenhues  <address@hidden>
+
+       Allow _AM_DEPENDENCIES to be used later in configure.
+       * m4/depend.m4 (_AM_DEPENDENCIES): Remove a previously existing
+       conftest.dir before recreating it.
+       Fixes bug#7864.
+       Report by Eric Blake, from report by Scott McCreary against M4.
+
+2011-01-18  Ralf Wildenhues  <address@hidden>
+
+       tests: avoid failure on w32 file systems.
+       * tests/parallel-tests-unreadable-log.test: SKIP if file cannot
+       be turned unreadable.
+
+2011-01-17  Ralf Wildenhues  <address@hidden>
+
+       tests: allow double-colon spy.test to work with HP-UX make.
+       * tests/spy.test: Fix comment typos.  Ensure prerequisites we
+       do not want to depend on are strictly older than the target.
+       Also test with a target out of date wrt. more than one rule.
+
 2011-01-17  Ralf Wildenhues  <address@hidden>
 
        Avoid local $_ perl variable, for Perl before 5.9.1.
diff --git a/m4/depend.m4 b/m4/depend.m4
index 714bc9c..a5726c6 100644
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -1,12 +1,12 @@
 ##                                                          -*- Autoconf -*-
 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010  Free Software Foundation, Inc.
+# 2010, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
+# serial 13
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -46,6 +46,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
diff --git a/tests/defs b/tests/defs
index 51d2213..3113869 100644
--- a/tests/defs
+++ b/tests/defs
@@ -21,6 +21,8 @@
 ##  Source static setup and definitions for the testsuite.  ##
 ## -------------------------------------------------------- ##
 
+# This code needs to be 'set -e' clean.
+
 # Ensure we are running from the right directory.
 test -f ./defs-static || {
    echo "$0: ./defs-static: not found in current directory" >&2
diff --git a/tests/defs-static.in b/tests/defs-static.in
index 9143178..9016207 100644
--- a/tests/defs-static.in
+++ b/tests/defs-static.in
@@ -2,7 +2,8 @@
 # @configure_input@
 #
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 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
@@ -18,7 +19,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Defines and minimal setup for Automake testing environment.
-# IMPORTANT: Multiple inclusions of this file should be idempotent!
+# Multiple inclusions of this file should be idempotent!
+# This code needs to be 'set -e' clean.
 
 # Be more Bourne compatible.
 # (Snippet inspired to configure's initialization in Autoconf 2.64)
@@ -57,7 +59,8 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 
2>&1; then
   fi
 else
   argv0=$0
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  # Avoid command substitution failure, for Tru64 sh -e and instspc*.test.
+  case `(set -o) 2>/dev/null || :` in *posix*) set -o posix;; esac
 fi
 
 testsrcdir='@abs_srcdir@'
diff --git a/tests/instspc-tests.sh b/tests/instspc-tests.sh
index 90087eb..78f40c4 100755
--- a/tests/instspc-tests.sh
+++ b/tests/instspc-tests.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2010, 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
@@ -191,12 +191,8 @@ fi
 
 ###  If we are still here, we have to run a test ...
 
-# We'll need the full setup provided by `tests/defs'.  Temporarly disable
-# the errexit flag, since the setup code might not be prepared to deal
-# with it.
-set +e
+# We'll need the full setup provided by `tests/defs'.
 . ./defs || Exit 99
-set -e
 
 eval "instspc_test_string=\${instspc__$instspc_test_name}" || Exit 99
 if test x"$instspc_test_string" = x; then
@@ -296,6 +292,8 @@ cd "./$build"
 
 ../configure --prefix "/$instspc_test_string-prefix"
 $MAKE
-DESTDIR="$dest" file="$instspc_test_string" $MAKE -e test-install-sep
+# Tru64 sh -e needs '|| Exit' in order to work correctly.
+DESTDIR="$dest" file="$instspc_test_string" $MAKE -e test-install-sep \
+  || Exit 1
 
 :
diff --git a/tests/parallel-tests-unreadable-log.test 
b/tests/parallel-tests-unreadable-log.test
index 6ebb2b6..572f03d 100755
--- a/tests/parallel-tests-unreadable-log.test
+++ b/tests/parallel-tests-unreadable-log.test
@@ -51,6 +51,7 @@ line=PASS; export line
 $MAKE foo.log
 $MAKE bar.log
 chmod a-r foo.log bar.log
+test ! -r foo.log || Exit 77
 $MAKE test-suite.log >stdout && { cat stdout; Exit 1; }
 cat stdout
 grep '^2 of 2 tests failed *$' stdout
diff --git a/tests/spy.test b/tests/spy.test
index 79673d5..f4bd6ef 100755
--- a/tests/spy.test
+++ b/tests/spy.test
@@ -16,8 +16,8 @@
 
 # Check whether double colon rules work.  The Unix V7 make manual
 # mentions double-colon rules, but POSIX does not.  They seem to be
-# supported by all Make implementation as we can tell. This test case
-# is a spy: we want to detect if there exist implementations where
+# supported by all Make implementation as far as we can tell. This test
+# case is a spy: we want to detect if there exist implementations where
 # these do not work.  We might use these rules to simplify the rebuild
 # rules (instead of the $? hack).
 
@@ -85,8 +85,18 @@ $sleep
 touch b
 $MAKE
 test "`cat a`" = rule1
+# Ensure a is strictly newer than b, so HP-UX make does not execute rule2.
+$sleep
 : > a
 $sleep
 touch c
 $MAKE
 test "`cat a`" = rule2
+: > a
+$sleep
+touch b c
+$MAKE
+grep rule1 a
+grep rule2 a
+
+:


hooks/post-receive
-- 
GNU Automake