From 302c93df04789860cb7a7a9f098788a12659fa9d Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 30 Nov 2014 20:37:35 -0500 Subject: Fix test runner for tests that use files. --- gtk2_ardour/ardev_common.sh.in | 4 +++- gtk2_ardour/artest | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in index 30723722e2..41c764b997 100644 --- a/gtk2_ardour/ardev_common.sh.in +++ b/gtk2_ardour/ardev_common.sh.in @@ -1,4 +1,6 @@ -TOP=`dirname "$0"`/.. +if [ -z "$TOP" ]; then + TOP=`dirname "$0"`/.. +fi #export G_DEBUG=fatal_criticals diff --git a/gtk2_ardour/artest b/gtk2_ardour/artest index cd2a55cdd5..c4a79ab249 100755 --- a/gtk2_ardour/artest +++ b/gtk2_ardour/artest @@ -1,5 +1,9 @@ #!/bin/sh -. `dirname "$0"`/../build/gtk2_ardour/ardev_common_waf.sh + +REL_TOP=`dirname "$0"`/.. +TOP=`realpath $REL_TOP` + +. $TOP/build/gtk2_ardour/ardev_common_waf.sh LIBS_DIR=$TOP/build/libs @@ -9,7 +13,9 @@ run_tests () { echo "Running tests for $1..." echo "-------------------------------------------" echo "" - $2 $LIBS_DIR/$1/run-tests + cd $LIBS_DIR/$1 + $2 ./run-tests + cd - echo "" } -- cgit v1.2.3