diff options
| author | Alan Conway <aconway@apache.org> | 2009-12-02 19:00:11 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-12-02 19:00:11 +0000 |
| commit | 59ab4a4ecaf9b6a820a0cf2e60a70add8e0bf31b (patch) | |
| tree | d80c1d37e6554c30d7d25fb2ed425c0bf8634274 /qpid/cpp/src/tests/reliable_replication_test | |
| parent | 7eaea4e705f4a0e13c71c4124102b7ae0d93c1c8 (diff) | |
| download | qpid-python-59ab4a4ecaf9b6a820a0cf2e60a70add8e0bf31b.tar.gz | |
Run cluster tests under cmake.
Various other test fixes.
- Env vars to abstract different library location under cmake/automake.
- More consistent use of env vars test_env.sh in test scripts.
- Fix replication/replicating_exchange mismatch.
- Add --no-module-dir to prevent accidentally loading modules.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@886259 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/reliable_replication_test')
| -rwxr-xr-x | qpid/cpp/src/tests/reliable_replication_test | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/qpid/cpp/src/tests/reliable_replication_test b/qpid/cpp/src/tests/reliable_replication_test index 165ece82e0..f57d11a263 100755 --- a/qpid/cpp/src/tests/reliable_replication_test +++ b/qpid/cpp/src/tests/reliable_replication_test @@ -28,28 +28,23 @@ trap stop_brokers EXIT stop_brokers() { if [[ $BROKER_A ]] ; then - ../qpidd -q --port $BROKER_A + $QPIDD_EXEC --no-module-dir -q --port $BROKER_A unset BROKER_A fi if [[ $BROKER_B ]] ; then - ../qpidd -q --port $BROKER_B + $QPIDD_EXEC --no-module-dir -q --port $BROKER_B unset BROKER_B fi } setup() { rm -f replication-source.log replication-dest.log - ../qpidd --daemon --port 0 --no-data-dir --no-module-dir --auth no --load-module $QPID_MODULE_DIR/replicating_listener.so --replication-queue replication --create-replication-queue true --log-enable trace+ --log-to-file replication-source.log --log-to-stderr 0 > qpidd-repl.port + $QPIDD_EXEC --daemon --port 0 --no-data-dir --no-module-dir --auth no --load-module $REPLICATING_LISTENER_LIB --replication-queue replication --create-replication-queue true --log-enable trace+ --log-to-file replication-source.log --log-to-stderr 0 > qpidd-repl.port BROKER_A=`cat qpidd-repl.port` - ../qpidd --daemon --port 0 --no-data-dir --no-module-dir --auth no --load-module $QPID_MODULE_DIR/replication_exchange.so --log-enable info+ --log-to-file replication-dest.log --log-to-stderr 0 > qpidd-repl.port + $QPIDD_EXEC --daemon --port 0 --no-data-dir --no-module-dir --auth no --load-module $REPLICATION_EXCHANGE_LIB --log-enable info+ --log-to-file replication-dest.log --log-to-stderr 0 > qpidd-repl.port BROKER_B=`cat qpidd-repl.port` - #../qpidd --port 5555 --no-data-dir --no-module-dir --auth no --load-module $QPID_MODULE_DIR/replicating_listener.so --replication-queue replication --create-replication-queue true --log-enable trace+ --log-to-file replication-source.log --log-to-stderr 0 & - #BROKER_A=5555 - - #../qpidd --port 6666 --no-data-dir --no-module-dir --auth no --load-module $QPID_MODULE_DIR/replication_exchange.so --log-enable info+ --log-to-file replication-dest.log --log-to-stderr 0 & - #BROKER_B=6666 echo "Testing replication from port $BROKER_A to port $BROKER_B" $PYTHON_COMMANDS/qpid-config -a "localhost:$BROKER_B" add exchange replication replication @@ -78,7 +73,7 @@ bounce_link() { echo "Route re-established" } -if test -d ${PYTHON_DIR} && test -e $QPID_MODULE_DIR/replicating_listener.so && test -e $QPID_MODULE_DIR/replication_exchange.so ; then +if test -d ${PYTHON_DIR} && test -e $REPLICATING_LISTENER_LIB && test -e $REPLICATION_EXCHANGE_LIB ; then setup for i in `seq 1 100000`; do echo Message $i; done > replicated.expected send & |