Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-28 07:58:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Clean up gtk case and fix post-game log checking.

Browse source
This commit is contained in:
ehouse 2009-07-28 05:02:09 +00:00
parent 3b62e04d07
commit 62b7d3c3a4
1 changed files with 31 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
xwords4/linux/scripts/sim_real.sh
View file

@ -45,17 +45,35 @@ game_curses() {
2>/tmp/$RUN_NAME/log_${COOKIE}_${INDEX}.txt < /dev/null &
}
game_gtk() {
NAME=$1
COOKIE=$2
WAIT=$3
INDEX=$4
SERVER_PARAMS=$5
$XWORDS -d $DICT -r $NAME -a $HOST -p $PORT \
-C $COOKIE $QUIT -z 0:$WAIT $SERVER_PARAMS \
2>/tmp/$RUN_NAME/log_${COOKIE}_${INDEX}.txt &
}
check_logs() {
COOKIE=$1
OK=1
for LOG in /tmp/$RUN_NAME/log_${COOKIE}_*.txt; do
if ! grep -q XWPROTO_END_GAME $LOG; then
echo "$LOG didn't end correctly; check it out."
OK=0
fi
done
[ 1 = $OK ] && echo "game $COOKIE ended successfully"
if [ -d /tmp/$RUN_NAME ]; then
OK=1
for LOG in /tmp/$RUN_NAME/log_${COOKIE}_*.txt; do
if ! grep -q XWPROTO_END_GAME $LOG; then
echo "$LOG didn't end correctly; check it out."
OK=0
else
rm $LOG # save some space
fi
done
[ 1 = $OK ] && echo "game $COOKIE ended successfully"
else
echo "log directory gone..."
fi
}
do_one() {
@ -88,8 +106,8 @@ do_one() {
game_curses $NAME $COOKIE $WAIT $INDEX \
"-s $REMOTES"
else
$XWORDS -d $DICT -r $NAME -s $REMOTES \
-a $HOST -p $PORT -C $COOKIE $QUIT &
game_gtk $NAME $COOKIE $WAIT $INDEX \
"-s $REMOTES"
fi
break
fi
@ -100,8 +118,7 @@ do_one() {
if [ "$USE_CURSES" = "yes" ]; then
game_curses $NAME $COOKIE $WAIT $INDEX
else
$XWORDS -d $DICT -r $NAME -a $HOST -p $PORT \
-C $COOKIE $QUIT &
game_gtk $NAME $COOKIE $WAIT $INDEX
fi
break
fi
@ -112,8 +129,7 @@ do_one() {
if [ "$USE_CURSES" = "yes" ]; then
game_curses $NAME $COOKIE $WAIT $INDEX
else
$XWORDS -d $DICT -r $NAME -a $HOST -p $PORT \
-C $COOKIE $QUIT &
game_gtk $NAME $COOKIE $WAIT $INDEX
fi
break
fi
@ -124,8 +140,7 @@ do_one() {
if [ "$USE_CURSES" = "yes" ]; then
game_curses $NAME $COOKIE $WAIT $INDEX
else
$XWORDS -d $DICT -r $NAME -a $HOST -p $PORT \
-C $COOKIE $QUIT &
game_gtk $NAME $COOKIE $WAIT $INDEX
fi
break
fi