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_federation_tests | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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

diff --git a/cpp/src/tests/run_federation_tests b/cpp/src/tests/run_federation_tests
index 3fe4bccb13..4c3b53ede2 100755
--- a/cpp/src/tests/run_federation_tests
+++ b/cpp/src/tests/run_federation_tests
@@ -20,8 +20,8 @@
 #
 
 # Run the federation tests.
-MY_DIR=`dirname \`which $0\``
-. `dirname $0`/python_env.sh
+
+source ./test_env.sh
 
 trap stop_brokers INT TERM QUIT
 
@@ -40,9 +40,7 @@ stop_brokers() {
 if test -d ${PYTHON_DIR} ;  then
     start_brokers
     echo "Running federation tests using brokers on ports $LOCAL_PORT $REMOTE_PORT"
-    PYTHONPATH=${PYTHON_DIR}:${MY_DIR}
-    export PYTHONPATH
-    $PYTHON_COMMANDS/qpid-python-test -m federation -b localhost:$LOCAL_PORT -Dremote-port=$REMOTE_PORT $@
+    $QPID_PYTHON_TEST -m federation -b localhost:$LOCAL_PORT -Dremote-port=$REMOTE_PORT $@
     RETCODE=$?
     stop_brokers
     if test x$RETCODE != x0; then 
-- 
cgit v1.2.1