From 7a70ee7193a85ceb52cbfe3df2684e947cee9456 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Mon, 30 Nov 2009 19:34:36 +0000
Subject: Clean up test environment variables, prepare for running more tests
 in cmake.

   - consolidate test env vars in test_env.sh, also useful from command line.
   - generate test_env.sh with autoconf/cmake to cover library location differences.
   - Remove explicit mention of .libs, use $QPID_MODULE_DIR to load modules.
   - Fix run_test to run valgrind under cmake

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@885557 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/tests/run_cluster_tests | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'cpp/src/tests/run_cluster_tests')

diff --git a/cpp/src/tests/run_cluster_tests b/cpp/src/tests/run_cluster_tests
index b6c144bb05..997cddf1e2 100755
--- a/cpp/src/tests/run_cluster_tests
+++ b/cpp/src/tests/run_cluster_tests
@@ -19,15 +19,12 @@
 # under the License.
 #
 
-srcdir=$(dirname $0)
-. $srcdir/test_env.sh checkout $srcdir/../../.. ../.. || exit 1
-. $srcdir/ais_check
+source ./test_env.sh
+source $srcdir/ais_check
 
 TEST_EXEC=$QPID_PYTHON_COMMANDS/qpid-python-test
 test -x  $TEST_EXEC || { echo Skipping test, $TEST_EXEC not found; exit 0; }
 
-PYTHONPATH=$srcdir:$PYTHONPATH
-
 # Delete old cluster test data
 OUTDIR=brokertest.tmp
 rm -rf $OUTDIR
-- 
cgit v1.2.1