tests: Capture player output via journal instead of client

Capturing the client's output tests both client and server, which is
nice.  However, player input isn't visible in the resulting file,
which makes it more difficult to understand.

Route player output to journal (econfig key "keep_journal 2"), and
ignore client output.

Separate tests for the client would be useful.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2013-05-31 10:41:18 +02:00
parent 1253cccd76
commit 9ca3fa95b8
4 changed files with 14123 additions and 13932 deletions

View file

@ -41,7 +41,7 @@ do
if [ "$need_update" ] if [ "$need_update" ]
then then
echo "Update Turn $t starting" >&3 echo "Update Turn $t starting" >&3
src/client/empire POGO peter <<EOF >&3 src/client/empire POGO peter <<EOF >/dev/null
power new power new
report * report *
cen * ?own#0 cen * ?own#0
@ -59,7 +59,7 @@ EOF
then c=POGO r=peter then c=POGO r=peter
else c="${p#0}"; r="$c" else c="${p#0}"; r="$c"
fi fi
src/client/empire "$c" "$r" <$j >&3 src/client/empire "$c" "$r" <$j >/dev/null
echo "Player $p Turn $t completed successfully" >&3 echo "Player $p Turn $t completed successfully" >&3
done done
need_update=y need_update=y

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -18,7 +18,7 @@ data "../../var/empire"
info "../../../../info.nr" info "../../../../info.nr"
builtin "../../share/empire/builtin" builtin "../../share/empire/builtin"
listen_addr "$EMPIREHOST" listen_addr "$EMPIREHOST"
keep_journal 1 keep_journal 2
EOF EOF
cp "$srcdir"/src/lib/global/*.config sandbox/share/empire/builtin cp "$srcdir"/src/lib/global/*.config sandbox/share/empire/builtin
} }