[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-404-g0c615cd

[Stefano Lattarini]

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=0c615cdc89beb544dedc7ee665e9e68e86f3468c

The branch, master has been updated
       via  0c615cdc89beb544dedc7ee665e9e68e86f3468c (commit)
      from  bbfe77bf4eb6bfbc30f5a02b10f9c5494471803f (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 0c615cdc89beb544dedc7ee665e9e68e86f3468c
Author: Stefano Lattarini <address@hidden>
Date:   Fri Nov 5 21:14:30 2010 +0100

    Fix potential bug in generated tests `instpc-*.test'.
    
    This bug is due to the changes introduced by the recently-merged
    "tests-init" branch.  In that branch, `tests/defs' didn't define
    anymore `$srcdir', instead defininig directly `$testsrcdir'; but
    the generated tests were using `$srcdir', hence the bug.
    Luckily, since the Automake parallel test driver automatically
    exports `srcdir' to a proper value, that prevented the bug from
    manifesting itself.
    
    * tests/Makefile.am ($(instspc_tests)): In the generated test
    scripts, use `$testsrcdir', not `$srcdir'.

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

Summary of changes:
 ChangeLog         |   13 +++++++++++++
 tests/Makefile.am |    6 +++---
 tests/Makefile.in |    6 +++---
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 010872d..16ec733 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-05  Stefano Lattarini  <address@hidden>
+
+       Fix potential bug in generated tests `instpc-*.test'.
+       This bug is due to the changes introduced by the recently-merged
+       "tests-init" branch.  In that branch, `tests/defs' didn't define
+       anymore `$srcdir', instead defininig directly `$testsrcdir'; but
+       the generated tests were using `$srcdir', hence the bug.
+       Luckily, since the Automake parallel test driver automatically
+       exports `srcdir' to a proper value, that prevented the bug from
+       manifesting itself.
+       * tests/Makefile.am ($(instspc_tests)): In the generated test
+       scripts, use `$testsrcdir', not `$srcdir'.
+
 2010-11-03  Stefano Lattarini  <address@hidden>
 
        Overhauled and modularized tests in `instspc.test'.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 70e14ae..2567baa 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -75,14 +75,14 @@ $(instspc_tests): Makefile.am
            echo '#!/bin/sh'; \
            echo '# DO NOT EDIT!  GENERATED AUTOMATICALLY!'; \
            echo; \
-           echo '# Ensure proper definition of $$srcdir.'; \
+           echo '# Ensure proper definition of $$testsrcdir.'; \
            echo 'am_skip_defs=yes'; \
            echo '. ./defs || exit 99'; \
-           echo 'test -n "$$srcdir" || exit 99 # sanity check'; \
+           echo 'test -n "$$testsrcdir" || exit 99 # sanity check'; \
            echo; \
            echo "instspc_test_name='$$name'"; \
            echo "instspc_action='test-$$action'"; \
-           echo ". \$$srcdir/instspc-tests.sh"; \
+           echo ". \$$testsrcdir/instspc-tests.sh"; \
          } > 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 99ce19e..9069286 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1516,14 +1516,14 @@ $(instspc_tests): Makefile.am
            echo '#!/bin/sh'; \
            echo '# DO NOT EDIT!  GENERATED AUTOMATICALLY!'; \
            echo; \
-           echo '# Ensure proper definition of $$srcdir.'; \
+           echo '# Ensure proper definition of $$testsrcdir.'; \
            echo 'am_skip_defs=yes'; \
            echo '. ./defs || exit 99'; \
-           echo 'test -n "$$srcdir" || exit 99 # sanity check'; \
+           echo 'test -n "$$testsrcdir" || exit 99 # sanity check'; \
            echo; \
            echo "instspc_test_name='$$name'"; \
            echo "instspc_action='test-$$action'"; \
-           echo ". \$$srcdir/instspc-tests.sh"; \
+           echo ". \$$testsrcdir/instspc-tests.sh"; \
          } > address@hidden
        $(AM_V_at)chmod a+rx address@hidden && mv -f address@hidden $@
 


hooks/post-receive
-- 
GNU Automake