On Friday 05 November 2010, Stefano Lattarini wrote: > On Thursday 04 November 2010, Stefano Lattarini wrote: > > > > In the end, are you OK with having me to merge "test-init" to master > > > > right > > > > away, and do future testsuite work on master only? > > > > > > Yes. > > Good. > I merged "tests-init" to master, fixed the resulting ChangeLog, and pushed. > (oh, and the testsuite still passes for me, obviously). Nonetheless, there was still a potential bug (introduced by the merge) lurking in there, which didn't manifest itself because, by sheer luck, the Automake parallel test driver worked around it (by exporting "srcdir=$(srcdir)" in the tests' environment).
After some testing, I pushed the attached patch, which should fix the bug. Regards, Stefano
From 0c615cdc89beb544dedc7ee665e9e68e86f3468c Mon Sep 17 00:00:00 2001 From: Stefano Lattarini <stefano.lattar...@gmail.com> Date: Fri, 5 Nov 2010 21:14:30 +0100 Subject: [PATCH] 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'. --- 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 <stefano.lattar...@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.lattar...@gmail.com> 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"; \ } > $...@-t $(AM_V_at)chmod a+rx $...@-t && mv -f $...@-t $@ 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"; \ } > $...@-t $(AM_V_at)chmod a+rx $...@-t && mv -f $...@-t $@ -- 1.7.1
