[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-206-g8070946

[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=80709460757a0858585e3275e0a06998db635f5b

The branch, master has been updated
       via  80709460757a0858585e3275e0a06998db635f5b (commit)
       via  c6bbc452fa438f194471788db5a965f4f687840a (commit)
      from  6b824c7d470c71ec0858144ac714572faa81759c (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 80709460757a0858585e3275e0a06998db635f5b
Merge: 6b824c7d470c71ec0858144ac714572faa81759c 
c6bbc452fa438f194471788db5a965f4f687840a
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Jun 6 16:40:49 2010 +0200

    Merge branch 'fix-distcheck'
    
    * fix-distcheck:
      Fix distcheck failure with distributed generated parallel tests.

commit c6bbc452fa438f194471788db5a965f4f687840a
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jun 3 14:04:06 2010 +0200

    Fix distcheck failure with distributed generated parallel tests.
    
    * tests/Makefile.am ($(parallel_tests)): Cope with $(srcdir)
    being different from the value at developer `make dist' time.
    * tests/defs.in: Protect against mutiple inclusion, by using ...
    ($am_defs_included): ... this new variable.
    ($srcdir): Do not compute, but simply define to address@hidden@'
    as substituted by configure.
    
    Report, suggestions and first fix by Ralf Wildenhues, final
    patch by Stefano Lattarini.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog         |   13 +++++++++++++
 tests/Makefile.am |    5 ++++-
 tests/Makefile.in |    5 ++++-
 tests/defs.in     |   20 ++++++++++++++------
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5f4d908..4f94715 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,17 @@
 2010-06-06  Stefano Lattarini  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Fix distcheck failure with distributed generated parallel tests.
+       * tests/Makefile.am ($(parallel_tests)): Cope with $(srcdir)
+       being different from the value at developer `make dist' time.
+       * tests/defs.in: Protect against mutiple inclusion, by using ...
+       ($am_defs_included): ... this new variable.
+       ($srcdir): Do not compute, but simply define to address@hidden@'
+       as substituted by configure.
+       Report, suggestions and first fix by Ralf Wildenhues, final
+       patch by Stefano Lattarini.
+
+2010-06-06  Stefano Lattarini  <address@hidden>
 
        Improve tests link*.test (enable `errexit' shell flag).
        * tests/link_c_cxx.test: Enable `errexit shell flag, and related
diff --git a/tests/Makefile.am b/tests/Makefile.am
index eefdb41..f709593 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -34,7 +34,10 @@ $(parallel_tests): Makefile.am
        { echo '#!/bin/sh'; \
          echo '# DO NOT EDIT! GENERATED AUTOMATICALLY!'; \
          echo 'parallel_tests=yes'; \
-         echo ". '$(srcdir)/$$input'"; \
+         echo '. ./defs || Exit 1'; \
+         echo '# So that the sourced test can re-exec ./defs safely.'; \
+         echo 'cd "$$curdir" || Exit 1'; \
+         echo ". \"\$$testsrcdir/$$input\""; \
        } > address@hidden
        $(AM_V_at)chmod a+rx address@hidden && mv -f address@hidden $@
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index fb75877..36fb41e 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1391,7 +1391,10 @@ $(parallel_tests): Makefile.am
        { echo '#!/bin/sh'; \
          echo '# DO NOT EDIT! GENERATED AUTOMATICALLY!'; \
          echo 'parallel_tests=yes'; \
-         echo ". '$(srcdir)/$$input'"; \
+         echo '. ./defs || Exit 1'; \
+         echo '# So that the sourced test can re-exec ./defs safely.'; \
+         echo 'cd "$$curdir" || Exit 1'; \
+         echo ". \"\$$testsrcdir/$$input\""; \
        } > address@hidden
        $(AM_V_at)chmod a+rx address@hidden && mv -f address@hidden $@
 
diff --git a/tests/defs.in b/tests/defs.in
index 497b57f..72e9d52 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -2,7 +2,7 @@
 # @configure_input@
 #
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 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
@@ -20,6 +20,13 @@
 # Defines for Automake testing environment.
 # Tom Tromey <address@hidden>
 
+# Protect this file against multiple inclusion, useful for generated tests.
+if test x"$am_defs_included" = xyes; then
+  : "$me: ./defs already included"
+  cd "$curdir/$testSubDir" || Exit 99
+
+else # not already included
+
 # Be more Bourne compatible.
 # (Snippet copied from configure's initialization in Autoconf 2.64)
 DUALCASE=1; export DUALCASE # for MKS sh
@@ -40,11 +47,7 @@ test -f ./defs || {
    exit 1
 }
 
-if test -z "$srcdir"; then
-   # compute $srcdir.
-   srcdir=`echo "$0" | sed -e 's,/[^\\/]*$,,'`
-   test "$srcdir" = $0 && srcdir=.
-else :; fi
+srcdir=${srcdir-'@abs_srcdir@'}
 
 # Ensure $srcdir is set correctly.
 test -f "$srcdir/defs.in" || {
@@ -428,7 +431,12 @@ AUTOMAKE_fails ()
   AUTOMAKE_run 1 ${1+"$@"}
 }
 
+# Register that this file has alredy been sourced.
+am_defs_included=yes
+
 # Turn on shell traces.
 set -x
 
 pwd
+
+fi # not already included


hooks/post-receive
-- 
GNU Automake