[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-618-gcdf8817

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

The branch, master has been updated
       via  cdf8817856cdf9a91baa95942241b05fbae452b7 (commit)
       via  e7f1b46eed49a4b5a7d39c86274921e199569290 (commit)
       via  726ecfbcc3b0c3fd29790e351a407fc65190c826 (commit)
      from  b068a03c2cba48e93c50376d02cf6cfb6a70e72e (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 cdf8817856cdf9a91baa95942241b05fbae452b7
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Jan 15 09:07:21 2011 +0100

    tests: avoid spurious failures due to fork failure in test setup
    
    * tests/defs: Ensure $me is always nonempty, to avoid spurious
    failures on MinGW/MSYS in case the preceding sed command could
    not be spawned.

commit e7f1b46eed49a4b5a7d39c86274921e199569290
Merge: b068a03 726ecfb
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Jan 15 09:03:34 2011 +0100

    Merge branch 'sanity-sleep-fix-master'
    
    * sanity-sleep-fix-master:
      Avoid configure warnings from wait about reused PIDs.

commit 726ecfbcc3b0c3fd29790e351a407fc65190c826
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Jan 15 09:02:57 2011 +0100

    Avoid configure warnings from wait about reused PIDs.
    
    * m4/sanity.m4 (AM_SANITY_CHECK): Hide wait stderr output.
    Fixes spurious failure of depcomp2.test.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog    |   11 +++++++++++
 m4/sanity.m4 |    9 +++++----
 tests/defs   |    4 +++-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1bf5412..5a1f6f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-15  Ralf Wildenhues  <address@hidden>
+
+       tests: avoid spurious failures due to fork failure in test setup
+       * tests/defs: Ensure $me is always nonempty, to avoid spurious
+       failures on MinGW/MSYS in case the preceding sed command could
+       not be spawned.
+
+       Avoid configure warnings from wait about reused PIDs.
+       * m4/sanity.m4 (AM_SANITY_CHECK): Hide wait stderr output.
+       Fixes spurious failure of depcomp2.test.
+
 2011-01-13  Ralf Wildenhues  <address@hidden>
 
        Avoid testsuite failures due to Autoconf Fortran change.
diff --git a/m4/sanity.m4 b/m4/sanity.m4
index ba97076..a9cac5c 100644
--- a/m4/sanity.m4
+++ b/m4/sanity.m4
@@ -1,13 +1,13 @@
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008, 2009, 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 7
+# serial 8
 
 # AM_SANITY_CHECK
 # ---------------
@@ -77,7 +77,8 @@ fi
 AC_CONFIG_COMMANDS_PRE(
   [AC_MSG_CHECKING([that generated files are newer than configure])
    if test -n "$am_sleep_pid"; then
-     wait $am_sleep_pid
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
    fi
    AC_MSG_RESULT([done])])
 rm -f conftest.file
diff --git a/tests/defs b/tests/defs
index 64ed985..0f84d0a 100644
--- a/tests/defs
+++ b/tests/defs
@@ -1,7 +1,8 @@
 # -*- shell-script -*-
 #
 # 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
@@ -31,6 +32,7 @@ test -f ./defs-static || {
 
 # The name of the current test (without the `.test' suffix.)
 me=`echo "$argv0" | sed -e 's,.*[\\/],,;s/\.test$//'`
+test -n "$me" || exit 99
 
 
 ## ---------------------------------------- ##


hooks/post-receive
-- 
GNU Automake