client: Unbreak standalone build

[empserver] / tests / actofgod-test

diff --git a/tests/actofgod-test b/tests/actofgod-test
index 0afe1bc496f581da2a119f2d840b95087adf880c..a1a5e1760ee45711611bc37bfee3004fbc9fb0cb 100755 (executable)
--- a/tests/actofgod-test
+++ b/tests/actofgod-test
@@ -9,30 +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
 
-begin_test "$srcdir"/tests/actofgod/init_script
+begin_test "$srcdir"/tests/actofgod/setup-POGO
 
 perl "$srcdir"/tests/actofgod/geninput.pl | feed_input POGO peter
 
 end_test
 
-cmp_out var/empire/server.log var/empire/journal.log actofgod.xdump
+cmp_logs_xdump