From b9567b6d461661700c60c63dbc35f37612a15a8e Mon Sep 17 00:00:00 2001
From: Tim Mayberry <mojofunk@gmail.com>
Date: Sat, 29 Nov 2014 20:42:21 +0700
Subject: Use ardev_common.sh to setup environment for running libardour tests

---
 libs/ardour/run-tests.sh | 13 ++++++++-----
 libs/ardour/test-env.sh  | 25 -------------------------
 2 files changed, 8 insertions(+), 30 deletions(-)
 delete mode 100644 libs/ardour/test-env.sh

(limited to 'libs/ardour')

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
-- 
cgit v1.2.3