diff options
| author | Alan Conway <aconway@apache.org> | 2008-06-18 17:53:30 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-06-18 17:53:30 +0000 |
| commit | 9bf82c2c8c45a5228643a285f8db0b1061a69ad9 (patch) | |
| tree | d38be99fcb793712c2a2b5fb56dcbbb8294ff818 /cpp/src/tests | |
| parent | 02757b560356e0ddb090fbe103e0b65db6dbd3b3 (diff) | |
| download | qpid-python-9bf82c2c8c45a5228643a285f8db0b1061a69ad9.tar.gz | |
Bring cluster code up to date.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@669236 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests')
| -rwxr-xr-x | cpp/src/tests/ais_check | 4 | ||||
| -rwxr-xr-x | cpp/src/tests/start_cluster | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/tests/ais_check b/cpp/src/tests/ais_check index ae0edf88c1..344f15a94e 100755 --- a/cpp/src/tests/ais_check +++ b/cpp/src/tests/ais_check @@ -2,7 +2,7 @@ # Check for requirements, run AIS tests if found. # -id -nG | grep '\<ais\>' || \ +id -nG | grep '\<ais\>' >/dev/null || \ NOGROUP="You are not a member of the ais group." ps -u root | grep aisexec >/dev/null || \ NOAISEXEC="The aisexec daemon is not running as root" @@ -24,4 +24,4 @@ EOF exit 0; # A warning, not a failure. fi -echo ./ais_run | newgrp ais +echo `dirname $0`/ais_run | newgrp ais diff --git a/cpp/src/tests/start_cluster b/cpp/src/tests/start_cluster index 03fb671bdf..876913bc2d 100755 --- a/cpp/src/tests/start_cluster +++ b/cpp/src/tests/start_cluster @@ -9,10 +9,11 @@ test -z "$*" && { echo "Usage: $0 cluster-size [options]"; exit 1; } rm -f cluster*.log cluster.ports SIZE=$1 shift -OPTS=$* CLUSTER=`whoami` # Cluster name=user name, avoid clashes. +OPTS="--load-module ../.libs/libqpidcluster.so -dp0 --log-output=cluster$i.log --cluster-name=$CLUSTER --no-data-dir --auth=no $*" + for (( i=0; i<SIZE; ++i )); do - PORT=`../qpidd --load-module ../.libs/libqpidcluster.so -dp0 --log-output=cluster$i.log --cluster-name $CLUSTER $OPTS` || exit 1 + PORT=`../qpidd $OPTS` || exit 1 echo $PORT >> cluster.ports done |