summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/run_header_test
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2009-11-30 19:34:36 +0000
committerAlan Conway <aconway@apache.org>2009-11-30 19:34:36 +0000
commit6bb0134ca322b6e50e6ec76a242f89259cd12274 (patch)
tree74ab33d008364a6b72fd879a0ad99693c42da33c /qpid/cpp/src/tests/run_header_test
parentf4b13c8d16754f29a331fe7ec2c7e1bc7995c524 (diff)
downloadqpid-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_header_test')
-rwxr-xr-xqpid/cpp/src/tests/run_header_test5
1 files changed, 2 insertions, 3 deletions
diff --git a/qpid/cpp/src/tests/run_header_test b/qpid/cpp/src/tests/run_header_test
index 1b5a3963db..07658343e7 100755
--- a/qpid/cpp/src/tests/run_header_test
+++ b/qpid/cpp/src/tests/run_header_test
@@ -24,13 +24,12 @@
# in both directions
srcdir=`dirname $0`
-. `dirname $0`/python_env.sh
+source ./test_env.sh
+
test -f qpidd.port && QPID_PORT=`cat qpidd.port`
if test -d ${PYTHON_DIR} ; then
./header_test -p $QPID_PORT
- PYTHONPATH=$PYTHON_DIR:$PYTHONPATH
- export PYTHONPATH
$srcdir/header_test.py "localhost" $QPID_PORT
else
echo "Skipping header test as python libs not found"