summaryrefslogtreecommitdiff
path: root/cpp/src/tests/python_tests
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
commit7a70ee7193a85ceb52cbfe3df2684e947cee9456 (patch)
tree3f8c78519d4169bc7c0ec8015a684879527a5350 /cpp/src/tests/python_tests
parentd3e2aeef6229259be003071988706c934677ff43 (diff)
downloadqpid-python-7a70ee7193a85ceb52cbfe3df2684e947cee9456.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/qpid@885557 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/python_tests')
-rwxr-xr-xcpp/src/tests/python_tests5
1 files changed, 2 insertions, 3 deletions
diff --git a/cpp/src/tests/python_tests b/cpp/src/tests/python_tests
index e2077ef7dc..b82123b5bd 100755
--- a/cpp/src/tests/python_tests
+++ b/cpp/src/tests/python_tests
@@ -20,10 +20,9 @@
#
# Run the python tests.
-. `dirname $0`/python_env.sh
+source ./test_env.sh
QPID_PORT=${QPID_PORT:-5672}
PYTHON_TESTS=${PYTHON_TESTS:-$*}
FAILING=${FAILING:-/dev/null}
-cd $PYTHON_DIR
-python commands/qpid-python-test -b localhost:$QPID_PORT -I $FAILING $PYTHON_TESTS || exit 1
+python $QPID_PYTHON_TEST -b localhost:$QPID_PORT -I $FAILING $PYTHON_TESTS || exit 1