Use ardev_common.sh to setup environment for running libardour tests

13 files changed, 30 insertions, 48 deletions

diff --git a/gtk2_ardour/arcall b/gtk2_ardour/arcall
index 6045de3303..ca12ede717 100755
--- a/gtk2_ardour/arcall
+++ b/gtk2_ardour/arcall
@@ -1,5 +1,6 @@
 #!/bin/sh
-. `dirname "$0"`/../build/gtk2_ardour/ardev_common_waf.sh
+TOP=`dirname "$0"`/..
+. $TOP/build/gtk2_ardour/ardev_common_waf.sh
 LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 export ARDOUR_RUNNING_UNDER_VALGRIND=TRUE
 exec valgrind \
diff --git a/gtk2_ardour/ardbg b/gtk2_ardour/ardbg
index 5855126fc6..abec22e22f 100755
--- a/gtk2_ardour/ardbg
+++ b/gtk2_ardour/ardbg
@@ -1,5 +1,6 @@
 #!/bin/sh
-. `dirname "$0"`/../build/gtk2_ardour/ardev_common_waf.sh
+TOP=`dirname "$0"`/..
+. $TOP/build/gtk2_ardour/ardev_common_waf.sh
 LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 export ARDOUR_INSIDE_GDB=1
 
diff --git a/gtk2_ardour/ardev b/gtk2_ardour/ardev
index c1cbd2d1d7..ff27697576 100755
--- a/gtk2_ardour/ardev
+++ b/gtk2_ardour/ardev
@@ -1,4 +1,5 @@
 #!/bin/sh
-. `dirname "$0"`/../build/gtk2_ardour/ardev_common_waf.sh
+TOP=`dirname "$0"`/..
+. $TOP/build/gtk2_ardour/ardev_common_waf.sh
 export UBUNTU_MENUPROXY=""
 exec $TOP/$EXECUTABLE "$@"
diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in
index 41c764b997..9c9dc65f22 100644
--- a/gtk2_ardour/ardev_common.sh.in
+++ b/gtk2_ardour/ardev_common.sh.in
@@ -1,6 +1,4 @@
-if [ -z "$TOP" ]; then
-    TOP=`dirname "$0"`/..
-fi
+[ -z $TOP ] && "ardev_common.sh: TOP var must be set" && exit 1
 
 #export G_DEBUG=fatal_criticals
 
diff --git a/gtk2_ardour/arldd b/gtk2_ardour/arldd
index 1fb675583f..31cc221748 100755
--- a/gtk2_ardour/arldd
+++ b/gtk2_ardour/arldd
@@ -1,3 +1,4 @@
 #!/bin/sh
-. `dirname "$0"`/../build/gtk2_ardour/ardev_common_waf.sh
+TOP=`dirname "$0"`/..
+. $TOP/build/gtk2_ardour/ardev_common_waf.sh
 exec ldd $TOP/$EXECUTABLE
diff --git a/gtk2_ardour/armass b/gtk2_ardour/armass
index fa1c25548f..7177d423f8 100755
--- a/gtk2_ardour/armass
+++ b/gtk2_ardour/armass
@@ -1,5 +1,7 @@
 #!/bin/sh
-. `dirname "$0"`/../build/gtk2_ardour/ardev_common_waf.sh
+
+TOP=`dirname "$0"`/..
+. $TOP/build/gtk2_ardour/ardev_common_waf.sh
 LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 export ARDOUR_RUNNING_UNDER_VALGRIND=TRUE
 exec valgrind \
diff --git a/gtk2_ardour/arprof b/gtk2_ardour/arprof
index 0d0f5f2fdc..1b66a856ef 100755
--- a/gtk2_ardour/arprof
+++ b/gtk2_ardour/arprof
@@ -7,7 +7,8 @@
 # see http://valgrind.org/docs/manual/cl-manual.html and
 # http://log.fundamental-code.com/2013/09/07/profiling-realtime-code
 
-. `dirname "$0"`/../build/gtk2_ardour/ardev_common_waf.sh
+TOP=`dirname "$0"`/..
+. $TOP/build/gtk2_ardour/ardev_common_waf.sh
 LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 export ARDOUR_RUNNING_UNDER_VALGRIND=TRUE
 
diff --git a/gtk2_ardour/artest b/gtk2_ardour/artest
index c4a79ab249..d461e17eba 100755
--- a/gtk2_ardour/artest
+++ b/gtk2_ardour/artest
@@ -1,8 +1,6 @@
 #!/bin/sh
 
-REL_TOP=`dirname "$0"`/..
-TOP=`realpath $REL_TOP`
-
+TOP=`dirname "$0"`/..
 . $TOP/build/gtk2_ardour/ardev_common_waf.sh
 
 LIBS_DIR=$TOP/build/libs
@@ -13,9 +11,7 @@ run_tests () {
   echo "Running tests for $1..."
   echo "-------------------------------------------"
   echo ""
-  cd $LIBS_DIR/$1
-  $2 ./run-tests
-  cd -
+  $2 $LIBS_DIR/$1/run-tests
   echo ""
 }
 
diff --git a/gtk2_ardour/arval b/gtk2_ardour/arval
index 2209dcb110..6aa8f8b08e 100755
--- a/gtk2_ardour/arval
+++ b/gtk2_ardour/arval
@@ -5,7 +5,8 @@ VALGRIND_OPTIONS="$VALGRIND_OPTIONS --error-limit=no"
 #VALGRIND_OPTIONS="$VALGRIND_OPTIONS --log-file=/tmp/ardour-%p.log"
 #VALGRIND_OPTIONS="$VALGRIND_OPTIONS --gen-suppressions=all"
 
-. `dirname "$0"`/../build/gtk2_ardour/ardev_common_waf.sh
+TOP=`dirname "$0"`/..
+. $TOP/build/gtk2_ardour/ardev_common_waf.sh
 LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 export ARDOUR_RUNNING_UNDER_VALGRIND=TRUE
 exec valgrind --tool=memcheck \
diff --git a/gtk2_ardour/vstdbg b/gtk2_ardour/vstdbg
index 60e3286950..988dbd3155 100755
--- a/gtk2_ardour/vstdbg
+++ b/gtk2_ardour/vstdbg
@@ -1,5 +1,6 @@
 #!/bin/sh
-. `dirname "$0"`/../build/gtk2_ardour/ardev_common_waf.sh
+TOP=`dirname "$0"`/..
+. $TOP/build/gtk2_ardour/ardev_common_waf.sh
 LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 export ARDOUR_INSIDE_GDB=1
 
diff --git a/libs/ardour/run-tests.sh b/libs/ardour/run-tests.sh
index e894fecb63..cf98211753 100755
--- a/libs/ardour/run-tests.sh
+++ b/libs/ardour/run-tests.sh
@@ -2,7 +2,10 @@
 #
 # Run libardour test suite.
 #
-. test-env.sh
+
+TOP=`dirname "$0"`/../..
+. $TOP/build/gtk2_ardour/ardev_common_waf.sh
+ARDOUR_LIBS_DIR=$TOP/build/libs/ardour
 
 if [ "$1" == "--single" ] || [ "$2" == "--single" ]; then
         if [ "$1" == "--single" ]; then
@@ -12,7 +15,7 @@ if [ "$1" == "--single" ] || [ "$2" == "--single" ]; then
 	else
                 TESTS='test_*'
         fi
-	for test_program in `find libs/ardour -name "$TESTS" -type f -perm /u+x`;
+	for test_program in `find $ARDOUR_LIBS_DIR -name "$TESTS" -type f -perm /u+x`;
 	do
 		echo "Running $test_program..."
                 if [ "$1" == "--debug" ]; then
@@ -25,11 +28,11 @@ if [ "$1" == "--single" ] || [ "$2" == "--single" ]; then
 	done
 else
         if [ "$1" == "--debug" ]; then
-                gdb ./libs/ardour/run-tests
+                gdb $ARDOUR_LIBS_DIR/run-tests
         elif [ "$1" == "--valgrind" ]; then
-                valgrind ./libs/ardour/run-tests
+                valgrind $ARDOUR_LIBS_DIR/run-tests
         else
-                ./libs/ardour/run-tests $*
+                $ARDOUR_LIBS_DIR/run-tests $*
         fi
 fi
 
diff --git a/libs/ardour/test-env.sh b/libs/ardour/test-env.sh
deleted file mode 100644
index 561f54d694..0000000000
--- a/libs/ardour/test-env.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-# Common libardour test env vars.
-#
-
-if [ ! -f './tempo.cc' ]; then
-    echo "This script must be run from within the libs/ardour directory";
-    exit 1;
-fi
-
-srcdir=`pwd`
-export ARDOUR_TEST_PATH=$srcdir/test/data
-cd ../../build
-
-libs='libs'
-
-export LD_LIBRARY_PATH=$libs/audiographer:$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/timecode:$libs/libltc:/usr/local/lib:/usr/local/lib64:$LD_LIBRARY_PATH
-
-export ARDOUR_CONFIG_PATH=$top:$top/gtk2_ardour:$libs/..:$libs/../gtk2_ardour
-export ARDOUR_PANNER_PATH=$libs/panners/2in2out:$libs/panners/1in2out:$libs/panners/vbap
-export ARDOUR_SURFACES_PATH=$libs/surfaces/osc:$libs/surfaces/generic_midi:$libs/surfaces/tranzport:$libs/surfaces/powermate:$libs/surfaces/mackie
-export ARDOUR_MCP_PATH="../mcp"
-export ARDOUR_DLL_PATH=$libs
-export ARDOUR_DATA_PATH=$top/gtk2_ardour:$top/build/gtk2_ardour:.
-export ARDOUR_BACKEND_PATH=$libs/backends/jack
diff --git a/vst/ardevst b/vst/ardevst
index f88b174445..827c38c180 100755
--- a/vst/ardevst
+++ b/vst/ardevst
@@ -1,5 +1,6 @@
 #!/bin/sh      
 
-. `dirname "$0"`/../build/gtk2_ardour/ardev_common_waf.sh
+TOP=`dirname "$0"`/..
+. $TOP/build/gtk2_ardour/ardev_common_waf.sh
 export LD_LIBRARY_PATH=$libs/../gtk2_ardour:$LD_LIBRARY_PATH
 exec wine $libs/../gtk2_ardour/ardour-$ARDOURVERSION-vst.exe.so "$@"