empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests: Factor out begin_tests(), end_tests()

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2013-12-28 16:50:14 +01:00
parent 5de1e5ec5f
commit 3404b9ce7f
3 changed files with 32 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tests/actofgod-test
View file

@ -29,27 +29,11 @@ WORLD_X 24
WORLD_Y 16 WORLD_Y 16
EOF EOF
# Create world, hide creation output begin_test "$srcdir"/tests/actofgod/init_script
src/util/files -e sandbox/etc/empire/econfig -f >/dev/null
cp -r sandbox/var/empire/tel sandbox/var/empire/empty.tel
start_server
src/client/empire POGO peter <"$srcdir"/tests/actofgod/init_script >/dev/null
stop_server
mv sandbox/var/empire/tel sandbox/var/empire/init.tel
mv sandbox/var/empire/empty.tel sandbox/var/empire/tel
mv sandbox/var/empire/journal.log sandbox/var/empire/init.journal.log
mv sandbox/var/empire/server.log sandbox/var/empire/init.server.log
# Start server
start_server
# Feed input
perl "$srcdir"/tests/actofgod/geninput.pl | src/client/empire POGO peter >/dev/null perl "$srcdir"/tests/actofgod/geninput.pl | src/client/empire POGO peter >/dev/null
# Stop server end_test
stop_server
src/util/empdump -e sandbox/etc/empire/econfig -x >sandbox/actofgod.xdump
# Test completed; compare results # Test completed; compare results
cmp_out var/empire/server.log var/empire/journal.log actofgod.xdump cmp_out var/empire/server.log var/empire/journal.log actofgod.xdump

13
tests/smoke-test
View file

@ -25,13 +25,10 @@ fi
create_sandbox create_sandbox
# Create world and start server begin_test "$srcdir"/tests/smoke/fairland.xdump
src/util/files -e sandbox/etc/empire/econfig -f >/dev/null
src/util/empdump -e sandbox/etc/empire/econfig -i "$srcdir"/tests/smoke/fairland.xdump
start_server
src/client/empire POGO peter <"$srcdir"/tests/smoke/newcap_script >/dev/null src/client/empire POGO peter <"$srcdir"/tests/smoke/newcap_script >/dev/null
# Feed player input
need_update= need_update=
for i in "$srcdir"/tests/smoke/[0-9]* for i in "$srcdir"/tests/smoke/[0-9]*
do do
@ -59,10 +56,6 @@ EOF
need_update=y need_update=y
done done
# Stop server end_test
stop_server
src/util/empdump -e sandbox/etc/empire/econfig -x >sandbox/smoke.xdump
# Smoke test completed; compare results
cmp_out var/empire/server.log var/empire/journal.log smoke.xdump cmp_out var/empire/server.log var/empire/journal.log smoke.xdump

27
tests/test-common.sh
View file

@ -70,6 +70,33 @@ stop_server()
done done
} }
begin_test()
{
src/util/files -e sandbox/etc/empire/econfig -f >/dev/null
case "$1" in
*.xdump)
src/util/empdump -e sandbox/etc/empire/econfig -i "$1"
;;
*)
cp -r sandbox/var/empire/tel sandbox/var/empire/empty.tel
start_server
src/client/empire POGO peter <"$1" >/dev/null
stop_server
mv sandbox/var/empire/tel sandbox/var/empire/init.tel
mv sandbox/var/empire/empty.tel sandbox/var/empire/tel
mv sandbox/var/empire/journal.log sandbox/var/empire/init.journal.log
mv sandbox/var/empire/server.log sandbox/var/empire/init.server.log
;;
esac
start_server
}
end_test ()
{
stop_server
src/util/empdump -e sandbox/etc/empire/econfig -x >sandbox/$test.xdump
}
cmp_out() cmp_out()
{ {
local opt exp act nrm msg ret=0 local opt exp act nrm msg ret=0