make number of devices configurable

This commit is contained in:
Eric House 2011-11-21 10:09:29 -08:00
parent 55d23c9502
commit a0a8a816a4

View file

@ -5,6 +5,7 @@ set -e -u
SEED="" SEED=""
RELAY_LOG="../relay/xwrelay.log" RELAY_LOG="../relay/xwrelay.log"
NDEVS=${NDEVS:-2}
usage() { usage() {
echo "usage: $(basename $0) [--seed RANDOM_SEED]" echo "usage: $(basename $0) [--seed RANDOM_SEED]"
@ -50,7 +51,7 @@ else
fi fi
# Run once to connect each with the relay # Run once to connect each with the relay
for NUM in $(seq 1 2); do for NUM in $(seq 0 $((NDEVS-1))); do
LOG="$(logname $NUM)" LOG="$(logname $NUM)"
ARGS=$COMMON_ARGS ARGS=$COMMON_ARGS
if [ -n "$SEED" ]; then if [ -n "$SEED" ]; then
@ -68,7 +69,7 @@ NBS=$DIR/nbs
ZERO_COUNT=0 ZERO_COUNT=0
while [ $ZERO_COUNT -lt 2 ]; do while [ $ZERO_COUNT -lt 2 ]; do
WORK_DONE="" WORK_DONE=""
for NUM in $(seq 1 2); do for NUM in $(seq 0 $((NDEVS-1))); do
LOG="$(logname $NUM)" LOG="$(logname $NUM)"
RELAYID=$(./scripts/relayID.sh --short $LOG) RELAYID=$(./scripts/relayID.sh --short $LOG)
MSG_COUNT=$(../relay/rq -m $RELAYID 2>/dev/null | sed 's,^.*-- ,,') MSG_COUNT=$(../relay/rq -m $RELAYID 2>/dev/null | sed 's,^.*-- ,,')
@ -98,7 +99,7 @@ done
# the game's over. Strictly speaking we need to get beyond that, but # the game's over. Strictly speaking we need to get beyond that, but
# reaching it is the first step. Debug failure to get that far first. # reaching it is the first step. Debug failure to get that far first.
ENDED="" ENDED=""
for NUM in $(seq 1 2); do for NUM in $(seq 0 $((NDEVS-1))); do
LOG="$(logname $NUM)" LOG="$(logname $NUM)"
if grep -q 'waiting for server to end game' $LOG; then if grep -q 'waiting for server to end game' $LOG; then
ENDED=1 ENDED=1
@ -107,7 +108,7 @@ for NUM in $(seq 1 2); do
done done
if [ -z "$ENDED" ]; then if [ -z "$ENDED" ]; then
for NUM in $(seq 1 2); do for NUM in $(seq 0 $((NDEVS-1))); do
LOG="$(logname $NUM)" LOG="$(logname $NUM)"
if ! grep -q 'all remaining tiles' $LOG; then if ! grep -q 'all remaining tiles' $LOG; then
echo "$LOG didn't seem to end correctly" echo "$LOG didn't seem to end correctly"