diff options
| author | Kenneth Anthony Giusti <kgiusti@apache.org> | 2011-12-25 23:49:26 +0000 |
|---|---|---|
| committer | Kenneth Anthony Giusti <kgiusti@apache.org> | 2011-12-25 23:49:26 +0000 |
| commit | b4d100beab624744c910a4cca3db4a40e09c8c54 (patch) | |
| tree | 3d4a28da29b22796b69e6b619ea77705c7bbb202 /qpid/cpp/src/tests | |
| parent | 01d31e73a888dd7619b68d899395a55eb3a5a849 (diff) | |
| download | qpid-python-b4d100beab624744c910a4cca3db4a40e09c8c54.tar.gz | |
QPID-3711: fix federation test script
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1224661 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests')
| -rwxr-xr-x | qpid/cpp/src/tests/run_federation_tests | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/qpid/cpp/src/tests/run_federation_tests b/qpid/cpp/src/tests/run_federation_tests index 14af4807ba..b71fa14c47 100755 --- a/qpid/cpp/src/tests/run_federation_tests +++ b/qpid/cpp/src/tests/run_federation_tests @@ -8,9 +8,9 @@ # 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 @@ -22,15 +22,15 @@ # Run the federation tests. source ./test_env.sh - +#set -x trap stop_brokers INT TERM QUIT if [ -f ../.libs/xml.so ] ; then MODULES="--load-module xml" # Load the XML exchange and run XML exchange federation tests - SKIPTESTS="" + SKIPTESTS= else - MODULES="--no-module-dir" - SKIPTESTS="-i *xml" + MODULES="--no-module-dir" + SKIPTESTS='-i *_xml' # note: single quotes prevent expansion of * fi start_brokers() { @@ -55,7 +55,7 @@ stop_brokers() { if test -d ${PYTHON_DIR} ; then start_brokers echo "Running federation tests using brokers on ports $LOCAL_PORT $REMOTE_PORT $REMOTE_B1 $REMOTE_B2" - $QPID_PYTHON_TEST -m federation "$SKIPTESTS" -b localhost:$LOCAL_PORT -Dremote-port=$REMOTE_PORT -Dextra-brokers="$REMOTE_B1 $REMOTE_B2" $@ + $QPID_PYTHON_TEST -m federation ${SKIPTESTS} -b localhost:$LOCAL_PORT -Dremote-port=$REMOTE_PORT -Dextra-brokers="$REMOTE_B1 $REMOTE_B2" $@ RETCODE=$? stop_brokers if test x$RETCODE != x0; then |