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_cluster_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_cluster_tests')
| -rwxr-xr-x | qpid/cpp/src/tests/run_cluster_tests | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/qpid/cpp/src/tests/run_cluster_tests b/qpid/cpp/src/tests/run_cluster_tests index b6c144bb05..997cddf1e2 100755 --- a/qpid/cpp/src/tests/run_cluster_tests +++ b/qpid/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 |