diff options
Diffstat (limited to 'cpp/src/tests/run_federation_tests')
| -rwxr-xr-x | cpp/src/tests/run_federation_tests | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/cpp/src/tests/run_federation_tests b/cpp/src/tests/run_federation_tests index 6142c1c37c..8d7954a533 100755 --- a/cpp/src/tests/run_federation_tests +++ b/cpp/src/tests/run_federation_tests @@ -1,7 +1,27 @@ #!/bin/sh + +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + # Run the federation tests. -MY_DIR=`dirname \`which $0\`` -PYTHON_DIR=${MY_DIR}/../../../python + +source ./test_env.sh trap stop_brokers INT TERM QUIT @@ -13,20 +33,17 @@ start_brokers() { } stop_brokers() { - ../qpidd -q --port $LOCAL_PORT - ../qpidd -q --port $REMOTE_PORT + $QPIDD_EXEC --no-module-dir -q --port $LOCAL_PORT + $QPIDD_EXEC --no-module-dir -q --port $REMOTE_PORT } if test -d ${PYTHON_DIR} ; then start_brokers echo "Running federation tests using brokers on ports $LOCAL_PORT $REMOTE_PORT" - PYTHONPATH=${PYTHON_DIR} - export PYTHONPATH - ${MY_DIR}/federation.py -v -s ${MY_DIR}/../../../specs/amqp.0-10-qpid-errata.xml -b localhost:$LOCAL_PORT --remote-port $REMOTE_PORT + $QPID_PYTHON_TEST -m federation -b localhost:$LOCAL_PORT -Dremote-port=$REMOTE_PORT $@ RETCODE=$? stop_brokers if test x$RETCODE != x0; then echo "FAIL federation tests"; exit 1; fi fi - |