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

tests: Define and use some abbreviations

Browse source 
No functional change.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2014-01-28 19:29:11 +01:00
parent 9a6998882a
commit 9f33eb1ba8
10 changed files with 52 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/actofgod-test
View file

@ -10,7 +10,7 @@ srcdir="$1"
. "$srcdir"/tests/test-common.sh . "$srcdir"/tests/test-common.sh
create_sandbox create_sandbox
cat >>sandbox/etc/empire/econfig <<EOF cat >>$econfig <<EOF
WORLD_X 24 WORLD_X 24
WORLD_Y 16 WORLD_Y 16
GODNEWS 1 GODNEWS 1
@ -22,4 +22,4 @@ perl "$srcdir"/tests/actofgod/geninput.pl | feed_input POGO peter
end_test end_test
cmp_out var/empire/server.log var/empire/journal.log final.xdump cmp_logs_xdump

6
tests/bridgefall-test
View file

@ -10,7 +10,7 @@ srcdir="$1"
. "$srcdir"/tests/test-common.sh . "$srcdir"/tests/test-common.sh
create_sandbox create_sandbox
cat >>sandbox/etc/empire/econfig <<EOF cat >>$econfig <<EOF
WORLD_X 20 WORLD_X 20
WORLD_Y 10 WORLD_Y 10
BRIDGETOWERS 1 BRIDGETOWERS 1
@ -19,11 +19,11 @@ EOF
begin_test "$srcdir"/tests/bridgefall/setup-POGO begin_test "$srcdir"/tests/bridgefall/setup-POGO
feed_dir "$srcdir"/tests/bridgefall/easy-on feed_dir "$srcdir"/tests/bridgefall/easy-on
stop_server stop_server
cat >>sandbox/etc/empire/econfig <<EOF cat >>$econfig <<EOF
EASY_BRIDGES 0 EASY_BRIDGES 0
EOF EOF
start_server start_server
feed_dir "$srcdir"/tests/bridgefall/easy-off feed_dir "$srcdir"/tests/bridgefall/easy-off
end_test end_test
cmp_out var/empire/server.log var/empire/journal.log final.xdump cmp_logs_xdump

6
tests/build-test
View file

@ -10,7 +10,7 @@ srcdir="$1"
. "$srcdir"/tests/test-common.sh . "$srcdir"/tests/test-common.sh
create_sandbox create_sandbox
cat >>sandbox/etc/empire/econfig <<EOF cat >>$econfig <<EOF
WORLD_X 20 WORLD_X 20
WORLD_Y 12 WORLD_Y 12
BRIDGETOWERS 1 BRIDGETOWERS 1
@ -21,7 +21,7 @@ begin_test "$srcdir"/tests/build/setup-POGO
feed_dir "$srcdir"/tests/build/units feed_dir "$srcdir"/tests/build/units
feed_dir "$srcdir"/tests/build/bridges-1 feed_dir "$srcdir"/tests/build/bridges-1
stop_server stop_server
cat >>sandbox/etc/empire/econfig <<EOF cat >>$econfig <<EOF
EASY_BRIDGES 0 EASY_BRIDGES 0
BRIDGETOWERS 0 BRIDGETOWERS 0
EOF EOF
@ -29,4 +29,4 @@ start_server
feed_dir "$srcdir"/tests/build/bridges-2 feed_dir "$srcdir"/tests/build/bridges-2
end_test end_test
cmp_out var/empire/server.log var/empire/journal.log final.xdump cmp_logs_xdump

6
tests/fairland-test
View file

@ -13,11 +13,11 @@ create_sandbox
exec 3>sandbox/fairland.out exec 3>sandbox/fairland.out
src/util/files -e sandbox/etc/empire/econfig -f >&3 $files -f >&3
src/util/fairland -e sandbox/etc/empire/econfig -s sandbox/newcap_script -R 1 10 30 >&3 $fairland -s sandbox/newcap_script -R 1 10 30 >&3
exec 3>&- exec 3>&-
src/util/empdump -e sandbox/etc/empire/econfig -x >sandbox/final.xdump $empdump -x >sandbox/final.xdump
cmp_out fairland.out final.xdump newcap_script cmp_out fairland.out final.xdump newcap_script

4
tests/files-test
View file

@ -13,10 +13,10 @@ create_sandbox
exec 3>sandbox/files.out exec 3>sandbox/files.out
src/util/files -e sandbox/etc/empire/econfig -f >&3 $files -f >&3
exec 3>&- exec 3>&-
src/util/empdump -e sandbox/etc/empire/econfig -x >sandbox/final.xdump $empdump -x >sandbox/final.xdump
cmp_out files.out final.xdump cmp_out files.out final.xdump

4
tests/fire-test
View file

@ -10,7 +10,7 @@ srcdir="$1"
. "$srcdir"/tests/test-common.sh . "$srcdir"/tests/test-common.sh
create_sandbox create_sandbox
cat >>sandbox/etc/empire/econfig <<EOF cat >>$econfig <<EOF
WORLD_X 32 WORLD_X 32
WORLD_Y 16 WORLD_Y 16
EASY_BRIDGES 1 EASY_BRIDGES 1
@ -20,4 +20,4 @@ begin_test "$srcdir"/tests/fire/setup-POGO
feed_dir "$srcdir"/tests/fire feed_dir "$srcdir"/tests/fire
end_test end_test
cmp_out var/empire/server.log var/empire/journal.log final.xdump cmp_logs_xdump

4
tests/info-test
View file

@ -11,7 +11,7 @@ srcdir="$1"
create_sandbox create_sandbox
# Suppress test-only commands: # Suppress test-only commands:
cat >>sandbox/etc/empire/econfig <<EOF cat >>$econfig <<EOF
running_test_suite 0 running_test_suite 0
EOF EOF
@ -44,7 +44,7 @@ EOF
end_test end_test
if perl $srcdir/tests/info/cmp-toc-vs-lists.pl info/toc sandbox/*.list if perl $testdir/cmp-toc-vs-lists.pl info/toc sandbox/*.list
then echo "Command documentation OK" then echo "Command documentation OK"
else echo "Command documentation FAIL"; false else echo "Command documentation FAIL"; false
fi fi

4
tests/retreat-test
View file

@ -10,7 +10,7 @@ srcdir="$1"
. "$srcdir"/tests/test-common.sh . "$srcdir"/tests/test-common.sh
create_sandbox create_sandbox
cat >>sandbox/etc/empire/econfig <<EOF cat >>$econfig <<EOF
WORLD_X 24 WORLD_X 24
WORLD_Y 12 WORLD_Y 12
EOF EOF
@ -19,4 +19,4 @@ begin_test "$srcdir"/tests/retreat/setup-POGO
feed_dir "$srcdir"/tests/retreat feed_dir "$srcdir"/tests/retreat
end_test end_test
cmp_out var/empire/server.log var/empire/journal.log final.xdump cmp_logs_xdump

2
tests/smoke-test
View file

@ -18,4 +18,4 @@ feed_dir "$srcdir"/tests/smoke
end_test end_test
cmp_out var/empire/server.log var/empire/journal.log final.xdump cmp_logs_xdump

50
tests/test-common.sh
View file

@ -8,6 +8,15 @@ fi
test=${0##*/} test=${0##*/}
test=${test%-test} test=${test%-test}
# Abbreviations
testdir="$srcdir/tests/$test"
econfig=sandbox/etc/empire/econfig
schedule=sandbox/etc/empire/schedule
data=sandbox/var/empire
empdump="src/util/empdump -e $econfig"
files="src/util/files -e $econfig"
fairland="src/util/fairland -e $econfig"
empthread=`sed -n 's/empthread *:= *\(.*\)/\1/p' <GNUmakefile` empthread=`sed -n 's/empthread *:= *\(.*\)/\1/p' <GNUmakefile`
warn_empthread=y warn_empthread=y
@ -23,9 +32,9 @@ check_empthread()
create_sandbox() create_sandbox()
{ {
rm -rf sandbox rm -rf sandbox
mkdir -p sandbox/etc/empire sandbox/share/empire/builtin sandbox/var/empire mkdir -p sandbox/etc/empire sandbox/share/empire/builtin $data
touch sandbox/etc/empire/schedule touch $schedule
cat >sandbox/etc/empire/econfig <<EOF cat >$econfig <<EOF
data "../../var/empire" data "../../var/empire"
info "../../../../info.nr" info "../../../../info.nr"
builtin "../../share/empire/builtin" builtin "../../share/empire/builtin"
@ -45,7 +54,7 @@ now()
start_server() start_server()
{ {
local pidfile=sandbox/var/empire/server.pid local pidfile=$data/server.pid
local timeout local timeout
# #
@ -64,7 +73,7 @@ start_server()
pid= pid=
trap 'if [ "$pid" ]; then kill -9 "$pid" 2>/dev/null || true; fi' EXIT trap 'if [ "$pid" ]; then kill -9 "$pid" 2>/dev/null || true; fi' EXIT
src/server/emp_server -e sandbox/etc/empire/econfig -R 1 -s -E crash-dump src/server/emp_server -e $econfig -R 1 -s -E crash-dump
timeout=$((`now`+5)) timeout=$((`now`+5))
until pid=`cat $pidfile 2>/dev/null` && [ -n "$pid" ] until pid=`cat $pidfile 2>/dev/null` && [ -n "$pid" ]
do do
@ -124,18 +133,18 @@ feed_dir()
begin_test() begin_test()
{ {
src/util/files -e sandbox/etc/empire/econfig -f >/dev/null $files -f >/dev/null
local xd= local xd=
case "$1" in case "$1" in
*.xdump) *.xdump)
xd="$1" xd="$1"
src/util/empdump -e sandbox/etc/empire/econfig -i "$xd" $empdump -i "$xd"
shift shift
;; ;;
esac esac
if [ -z "$xd" ] || [ "$#" -ne 0 ] if [ -z "$xd" ] || [ "$#" -ne 0 ]
then then
cp -r sandbox/var/empire/tel sandbox/var/empire/empty.tel cp -r $data/tel $data/empty.tel
start_server start_server
if [ "$#" -eq 0 ] if [ "$#" -eq 0 ]
then feed_input POGO peter then feed_input POGO peter
@ -143,14 +152,14 @@ begin_test()
fi fi
echo 'edit c * ?tgms>0 t 0' | feed_input POGO peter echo 'edit c * ?tgms>0 t 0' | feed_input POGO peter
stop_server stop_server
mv sandbox/var/empire/tel sandbox/var/empire/setup.tel mv $data/tel $data/setup.tel
mv sandbox/var/empire/empty.tel sandbox/var/empire/tel mv $data/empty.tel $data/tel
mv sandbox/var/empire/news sandbox/var/empire/setup.news mv $data/news $data/setup.news
>sandbox/var/empire/news >$data/news
mv sandbox/var/empire/lostitems sandbox/var/empire/setup.lostitems mv $data/lostitems $data/setup.lostitems
>sandbox/var/empire/lostitems >$data/lostitems
mv sandbox/var/empire/journal.log sandbox/var/empire/setup.journal.log mv $data/journal.log $data/setup.journal.log
mv sandbox/var/empire/server.log sandbox/var/empire/setup.server.log mv $data/server.log $data/setup.server.log
fi fi
start_server start_server
} }
@ -158,7 +167,12 @@ begin_test()
end_test () end_test ()
{ {
stop_server stop_server
src/util/empdump -e sandbox/etc/empire/econfig -x >sandbox/final.xdump $empdump -x >sandbox/final.xdump
}
cmp_logs_xdump()
{
cmp_out var/empire/server.log var/empire/journal.log final.xdump
} }
cmp_out() cmp_out()
@ -171,7 +185,7 @@ cmp_out()
*/server.log) opt=-s ;; */server.log) opt=-s ;;
*) opt= ;; *) opt= ;;
esac esac
exp="$srcdir/tests/$test/${i##*/}" exp="$testdir/${i##*/}"
act="sandbox/$i" act="sandbox/$i"
nrm="sandbox/normalized-${i##*/}" nrm="sandbox/normalized-${i##*/}"
perl "$srcdir"/tests/normalize.pl $opt "$act" >"$nrm" perl "$srcdir"/tests/normalize.pl $opt "$act" >"$nrm"