client: Unbreak standalone build

[empserver] / tests / actofgod-test

diff --git a/tests/actofgod-test b/tests/actofgod-test
index 169c10096a52d03711f60ebb24c48198b0c40de4..a1a5e1760ee45711611bc37bfee3004fbc9fb0cb 100755 (executable)
--- a/tests/actofgod-test
+++ b/tests/actofgod-test
@@ -9,51 +9,17 @@ srcdir="$1"
 
 . "$srcdir"/tests/test-common.sh
 
-#
-# Currently expected to work only with thread package LWP, because:
-# 
-# - Thread scheduling is reliably deterministic only with LWP
-# - Shell builtin kill appears not to do the job in MinGW
-# - The Windows server tries to run as service when -d isn't
-#   specified
-#
-# TODO address these shortcomings.
-#
-if [ `sed -n 's/empthread *:= *\(.*\)/\1/p' <GNUmakefile` != LWP ]
-then echo "Warning: test not expected to work with this thread package!" >&2
-fi
-
 create_sandbox
-cat >>sandbox/etc/empire/econfig <<EOF
+cat >>$econfig <<EOF
 WORLD_X 24
 WORLD_Y 16
+GODNEWS 1
 EOF
 
-exec 3>sandbox/actofgod.out
-
-# Create world, hide creation output
-src/util/files -e sandbox/etc/empire/econfig -f >&3
-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
-
-# Stop server
-stop_server
+begin_test "$srcdir"/tests/actofgod/setup-POGO
 
-exec 3>&-
+perl "$srcdir"/tests/actofgod/geninput.pl | feed_input POGO peter
 
-src/util/empdump -e sandbox/etc/empire/econfig -x >sandbox/actofgod.xdump
+end_test
 
-# Test completed; compare results
-cmp_out actofgod.out var/empire/server.log var/empire/journal.log actofgod.xdump
+cmp_logs_xdump