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 | 9bd37c771305c1744470bb24f5bf515ce8af5520 (patch) | |
| tree | ebccd7439ee2459aa7fe4f51fd2957dd4ce331fa /cpp/src/tests/federated_cluster_test | |
| parent | 260ac89e2ac7596cd4ede19cbfb9c01dc7769827 (diff) | |
| download | qpid-python-9bd37c771305c1744470bb24f5bf515ce8af5520.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/qpid@886259 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/federated_cluster_test')
| -rwxr-xr-x | cpp/src/tests/federated_cluster_test | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cpp/src/tests/federated_cluster_test b/cpp/src/tests/federated_cluster_test index 89bb711c3e..70bec5e703 100755 --- a/cpp/src/tests/federated_cluster_test +++ b/cpp/src/tests/federated_cluster_test @@ -33,15 +33,15 @@ fail() { stop_brokers() { if [[ $BROKER_A ]] ; then - ../qpidd -q --port $BROKER_A + ../qpidd --no-module-dir -q --port $BROKER_A unset BROKER_A fi if [[ $NODE_1 ]] ; then - ../qpidd -q --port $NODE_1 + ../qpidd --no-module-dir -q --port $NODE_1 unset NODE_1 fi if [[ $NODE_2 ]] ; then - ../qpidd -q --port $NODE_2 + ../qpidd --no-module-dir -q --port $NODE_2 unset NODE_2 fi if [ -f cluster.ports ]; then @@ -51,13 +51,14 @@ stop_brokers() { start_brokers() { #start single node... - ../qpidd --daemon --port 0 --no-data-dir --no-module-dir --auth no --log-enable info+ > fed.port.tmp - BROKER_A=`cat fed.port.tmp` + BROKER_A=`../qpidd --daemon --port 0 --no-data-dir --no-module-dir --auth no --log-enable info+` || fail "BROKER_A failed to start" #...and start cluster $srcdir/start_cluster 2 || fail "Could not start cluster" NODE_1=$(head -1 cluster.ports) NODE_2=$(tail -1 cluster.ports) + test -n "$NODE_1" || fail "NODE_1 failed to start" + test -n "$NODE_2" || fail "NODE_2 failed to start" } setup() { |