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'.

diff --git a/ChangeLog b/ChangeLog
index 010872dd6200dfd84e43d290b59e55c0571f0e41..16ec73370280b5f3447166086b46b9ac09c5d726 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-05  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       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  <stefano.lattarini@gmail.com>
 
        Overhauled and modularized tests in `instspc.test'.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 70e14aef1abd1ef35e25c25066a40fc4df27ac31..2567baa40fc58b2b578632b79ed260da1edff41c 100644 (file)
--- 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"; \
          } > $@-t
        $(AM_V_at)chmod a+rx $@-t && mv -f $@-t $@
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 99ce19eb959173a4632eaf7a2a6cb8afa0d6b6d5..9069286da770c359a21dd1be8cd5fd5f924f5e22 100644 (file)
--- 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"; \
          } > $@-t
        $(AM_V_at)chmod a+rx $@-t && mv -f $@-t $@