diff options
| author | Alan Conway <aconway@apache.org> | 2009-11-30 19:34:36 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-11-30 19:34:36 +0000 |
| commit | 6bb0134ca322b6e50e6ec76a242f89259cd12274 (patch) | |
| tree | 74ab33d008364a6b72fd879a0ad99693c42da33c /qpid/cpp/src/tests/run_federation_tests | |
| parent | f4b13c8d16754f29a331fe7ec2c7e1bc7995c524 (diff) | |
| download | qpid-python-6bb0134ca322b6e50e6ec76a242f89259cd12274.tar.gz | |
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@885557 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/run_federation_tests')
| -rwxr-xr-x | qpid/cpp/src/tests/run_federation_tests | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/qpid/cpp/src/tests/run_federation_tests b/qpid/cpp/src/tests/run_federation_tests index 3fe4bccb13..4c3b53ede2 100755 --- a/qpid/cpp/src/tests/run_federation_tests +++ b/qpid/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 |