tests: Use feed_files for setup scripts

To make setup scripting more similar to test scripting.  Also permits
use of countries other than POGO there, but that isn't necessary right
now.

Setup scripts renamed from init_script to setup-POGO.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

tests/actofgod-test

@@ -16,7 +16,7 @@ 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
 

tests/fire-test

@@ -16,7 +16,7 @@ WORLD_Y 16
 EASY_BRIDGES 1
 EOF
 
-begin_test "$srcdir"/tests/fire/init_script
+begin_test "$srcdir"/tests/fire/setup-POGO
 feed_dir "$srcdir"/tests/fire
 end_test
 

tests/test-common.sh

@@ -135,12 +135,15 @@ begin_test()
     then
 	cp -r sandbox/var/empire/tel sandbox/var/empire/empty.tel
 	start_server
-	feed_input POGO peter "$@"
+	if [ "$#" -eq 0 ]
+	then feed_input POGO peter
+	else feed_files "$@"
+	fi
 	stop_server
-	mv sandbox/var/empire/tel sandbox/var/empire/init.tel
+	mv sandbox/var/empire/tel sandbox/var/empire/setup.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
+	mv sandbox/var/empire/journal.log sandbox/var/empire/setup.journal.log
+	mv sandbox/var/empire/server.log sandbox/var/empire/setup.server.log
     fi
     start_server
 }