Make: Get SHELL from Autoconf

[empserver] / tests / fire-test

diff --git a/tests/fire-test b/tests/fire-test
index e4de869a0ff16cda0b00159d8888a2faf611cfb9..7dc094b00cce8b40704975756ef535f16fb89346 100755 (executable)
--- a/tests/fire-test
+++ b/tests/fire-test
@@ -10,22 +10,14 @@ srcdir="$1"
 . "$srcdir"/tests/test-common.sh
 
 create_sandbox
-cat >>sandbox/etc/empire/econfig <<EOF
+cat >>$econfig <<EOF
 WORLD_X 32
 WORLD_Y 16
 EASY_BRIDGES 1
-GODNEWS 0
 EOF
 
-begin_test "$srcdir"/tests/fire/init_script
-
-for i in `git ls-files "$srcdir"/tests/fire | grep '/[0-9][0-9]-.*$'`
-do
-    c="${i##*/??-}"
-    r=`echo $c | sed 's/^POGO$/peter/'`
-    feed_input "$c" "$r" "$i"
-done
-
+begin_test "$srcdir"/tests/fire/setup-POGO
+feed_dir "$srcdir"/tests/fire
 end_test
 
-cmp_out var/empire/server.log var/empire/journal.log fire.xdump
+cmp_logs_xdump