diff options
Diffstat (limited to 'cpp/src')
| -rwxr-xr-x | cpp/src/tests/python_tests | 2 | ||||
| -rwxr-xr-x | cpp/src/tests/run_acl_tests | 2 | ||||
| -rw-r--r-- | cpp/src/tests/test_env.sh.in | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/tests/python_tests b/cpp/src/tests/python_tests index 51c808a6c9..e367004a71 100755 --- a/cpp/src/tests/python_tests +++ b/cpp/src/tests/python_tests @@ -26,4 +26,4 @@ QPID_PORT=${QPID_PORT:-5672} PYTHON_TESTS=${PYTHON_TESTS:-$*} FAILING=${FAILING:-/dev/null} -python $QPID_PYTHON_TEST -b localhost:$QPID_PORT -I $FAILING $PYTHON_TESTS || exit 1 +python $QPID_PYTHON_TEST -m qpid_tests.broker_0_10 -m qpid.tests -b localhost:$QPID_PORT -I $FAILING $PYTHON_TESTS || exit 1 diff --git a/cpp/src/tests/run_acl_tests b/cpp/src/tests/run_acl_tests index 7112f621a1..aff13408ed 100755 --- a/cpp/src/tests/run_acl_tests +++ b/cpp/src/tests/run_acl_tests @@ -53,8 +53,6 @@ if test -d ${PYTHON_DIR} ; then cp $srcdir/policy.acl $DATA_DIR start_brokers echo "Running acl tests using brokers on ports $LOCAL_PORT" - PYTHONPATH=$PYTHON_DIR:$srcdir - export PYTHONPATH $QPID_PYTHON_TEST -b localhost:$LOCAL_PORT -m acl || EXITCODE=1 stop_brokers || EXITCODE=1 test_loading_acl_from_absolute_path || EXITCODE=1 diff --git a/cpp/src/tests/test_env.sh.in b/cpp/src/tests/test_env.sh.in index cf0758e022..0ce7fabe8c 100644 --- a/cpp/src/tests/test_env.sh.in +++ b/cpp/src/tests/test_env.sh.in @@ -34,8 +34,10 @@ if [ ! -d $PYTHON_DIR -a -d $top_srcdir/../python ]; then export PYTHON_DIR=$top_srcdir/../python export QPID_PYTHON_TEST=$PYTHON_DIR/qpid-python-test fi +export QPID_TESTS=$top_srcdir/../tests +export QPID_TESTS_PY=$QPID_TESTS/src/py export PYTHON_COMMANDS=$PYTHON_DIR/commands -export PYTHONPATH=$srcdir:$PYTHON_DIR:$PYTHON_COMMANDS:$PYTHONPATH +export PYTHONPATH=$srcdir:$PYTHON_DIR:$PYTHON_COMMANDS:$QPID_TESTS_PY:$PYTHONPATH export QPID_CONFIG_EXEC=$PYTHON_COMMANDS/qpid-config export QPID_ROUTE_EXEC=$PYTHON_COMMANDS/qpid-route export QPID_CLUSTER_EXEC=$PYTHON_COMMANDS/qpid-cluster |