diff options
| author | Jonathan Robie <jonathan@apache.org> | 2010-10-20 22:15:24 +0000 |
|---|---|---|
| committer | Jonathan Robie <jonathan@apache.org> | 2010-10-20 22:15:24 +0000 |
| commit | fdebc18142c0479cd4e603affac141e7bdd5b50b (patch) | |
| tree | e24d10c9ced332377c466d21b7ab08ab2590b9a1 /cpp/src/tests/run_federation_tests | |
| parent | 9cec65bfe71c9a6a1ddb4822bd9e782c20c9f96d (diff) | |
| download | qpid-python-fdebc18142c0479cd4e603affac141e7bdd5b50b.tar.gz | |
Adds support for federation in the XML exchange.
Resolves QPID-2348 for the XML Exchange. Also made some changes to the file structure for fedop constants.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1025780 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/run_federation_tests')
| -rwxr-xr-x | cpp/src/tests/run_federation_tests | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/cpp/src/tests/run_federation_tests b/cpp/src/tests/run_federation_tests index f5bb123d0a..4be27a2e85 100755 --- a/cpp/src/tests/run_federation_tests +++ b/cpp/src/tests/run_federation_tests @@ -25,29 +25,37 @@ source ./test_env.sh 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="" +else + MODULES="--no-module-dir" + SKIPTESTS="-i *xml" +fi + start_brokers() { - ../qpidd --daemon --port 0 --no-data-dir --no-module-dir --auth no > qpidd.port + ../qpidd --daemon --port 0 --no-data-dir $MODULES --auth no > qpidd.port LOCAL_PORT=`cat qpidd.port` - ../qpidd --daemon --port 0 --no-data-dir --no-module-dir --auth no > qpidd.port + ../qpidd --daemon --port 0 --no-data-dir $MODULES --auth no > qpidd.port REMOTE_PORT=`cat qpidd.port` - ../qpidd --daemon --port 0 --no-data-dir --no-module-dir --auth no > qpidd.port + ../qpidd --daemon --port 0 --no-data-dir $MODULES --auth no > qpidd.port REMOTE_B1=`cat qpidd.port` - ../qpidd --daemon --port 0 --no-data-dir --no-module-dir --auth no > qpidd.port + ../qpidd --daemon --port 0 --no-data-dir $MODULES --auth no > qpidd.port REMOTE_B2=`cat qpidd.port` } stop_brokers() { - $QPIDD_EXEC --no-module-dir -q --port $LOCAL_PORT - $QPIDD_EXEC --no-module-dir -q --port $REMOTE_PORT - $QPIDD_EXEC --no-module-dir -q --port $REMOTE_B1 - $QPIDD_EXEC --no-module-dir -q --port $REMOTE_B2 + $QPIDD_EXEC $MODULES -q --port $LOCAL_PORT + $QPIDD_EXEC $MODULES -q --port $REMOTE_PORT + $QPIDD_EXEC $MODULES -q --port $REMOTE_B1 + $QPIDD_EXEC $MODULES -q --port $REMOTE_B2 } 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 -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 |