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

tests: Use feed_files for setup scripts

Browse source 
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>
This commit is contained in:
Markus Armbruster 2014-01-11 12:09:34 +01:00
parent c82a481bc3
commit cf942fbf1b
5 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tests/test-common.sh
View file

@ -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
}