diff options
| author | Rafael H. Schloming <rhs@apache.org> | 2010-02-14 14:59:24 +0000 |
|---|---|---|
| committer | Rafael H. Schloming <rhs@apache.org> | 2010-02-14 14:59:24 +0000 |
| commit | 074811c4bf1531f04b11db25f348e6c520bc4799 (patch) | |
| tree | dd46e4aa9bdaca64974bbddc810f3212d935edd5 /cpp/src/tests | |
| parent | a025819835829ea7658e4886ddb6e5e488f916eb (diff) | |
| download | qpid-python-074811c4bf1531f04b11db25f348e6c520bc4799.tar.gz | |
moved qpid-* tools out of qpid/python into qpid/tools; moved qmf library into extras/qmf
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@910016 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests')
| -rwxr-xr-x | cpp/src/tests/run_cli_tests | 2 | ||||
| -rw-r--r-- | cpp/src/tests/test_env.sh.in | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/cpp/src/tests/run_cli_tests b/cpp/src/tests/run_cli_tests index f3cdea0d4f..3f1388b9f5 100755 --- a/cpp/src/tests/run_cli_tests +++ b/cpp/src/tests/run_cli_tests @@ -70,7 +70,7 @@ stop_brokers() { if test -d ${PYTHON_DIR} ; then start_brokers echo "Running CLI tests using brokers on ports $LOCAL_PORT $REMOTE_PORT" - $PYTHON_COMMANDS/qpid-python-test -m cli_tests -b localhost:$LOCAL_PORT -Dremote-port=$REMOTE_PORT -Dcli-dir=$CLI_DIR $targs $@ + $QPID_PYTHON_TEST -m cli_tests -b localhost:$LOCAL_PORT -Dremote-port=$REMOTE_PORT -Dcli-dir=$CLI_DIR $targs $@ RETCODE=$? stop_brokers if test x$RETCODE != x0; then diff --git a/cpp/src/tests/test_env.sh.in b/cpp/src/tests/test_env.sh.in index 0ce7fabe8c..87fbbd128b 100644 --- a/cpp/src/tests/test_env.sh.in +++ b/cpp/src/tests/test_env.sh.in @@ -36,8 +36,10 @@ if [ ! -d $PYTHON_DIR -a -d $top_srcdir/../python ]; then 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:$QPID_TESTS_PY:$PYTHONPATH +export QPID_TOOLS=$top_srcdir/../tools +export QMF_LIB=$top_srcdir/../extras/qmf/src/py +export PYTHON_COMMANDS=$QPID_TOOLS/src/py +export PYTHONPATH=$srcdir:$PYTHON_DIR:$PYTHON_COMMANDS:$QPID_TESTS_PY:$QMF_LIB:$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 |