From 21b8add73e4f3e5ab361eaf16bfbc3157e2d6e6c Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 16 Jan 2014 21:59:41 +0100 Subject: [PATCH] tests/bridgefall: New; exercising splashing of bridges Stuff sitting on bridges isn't covered, yet. tests/fire has some. To be moved here eventually. The test exposes bugs. They're marked "BUG:" in the test input. Signed-off-by: Markus Armbruster --- Make.mk | 2 + tests/bridgefall-test | 29 + tests/bridgefall/easy-off/02-1 | 26 + tests/bridgefall/easy-off/99-POGO | 5 + tests/bridgefall/easy-on/01-1 | 13 + tests/bridgefall/easy-on/99-POGO | 1 + tests/bridgefall/final.xdump | 5195 +++++++++++++++++++++++++++++ tests/bridgefall/journal.log | 269 ++ tests/bridgefall/server.log | 34 + tests/bridgefall/setup-POGO | 47 + 10 files changed, 5621 insertions(+) create mode 100755 tests/bridgefall-test create mode 100644 tests/bridgefall/easy-off/02-1 create mode 100644 tests/bridgefall/easy-off/99-POGO create mode 100644 tests/bridgefall/easy-on/01-1 create mode 100644 tests/bridgefall/easy-on/99-POGO create mode 100644 tests/bridgefall/final.xdump create mode 100644 tests/bridgefall/journal.log create mode 100644 tests/bridgefall/server.log create mode 100644 tests/bridgefall/setup-POGO diff --git a/Make.mk b/Make.mk index 17ed7c8a..0186fa5b 100644 --- a/Make.mk +++ b/Make.mk @@ -263,11 +263,13 @@ ifeq ($(empthread),LWP) $(srcdir)/tests/actofgod-test $(srcdir) $(srcdir)/tests/build-test $(srcdir) $(srcdir)/tests/fire-test $(srcdir) + $(srcdir)/tests/bridgefall-test $(srcdir) else @echo "$(srcdir)/tests/smoke-test SKIPPED" @echo "$(srcdir)/tests/actofgod-test SKIPPED" @echo "$(srcdir)/tests/build-test SKIPPED" @echo "$(srcdir)/tests/fire-test SKIPPED" + @echo "$(srcdir)/tests/bridgefall-test SKIPPED" endif diff --git a/tests/bridgefall-test b/tests/bridgefall-test new file mode 100755 index 00000000..28575cf4 --- /dev/null +++ b/tests/bridgefall-test @@ -0,0 +1,29 @@ +#!/bin/sh -e +# Collapsing bridge test for Empire + +if [ $# -ne 1 ] +then echo "Usage: $0 SRCDIR" >&2; exit 1 +fi + +srcdir="$1" + +. "$srcdir"/tests/test-common.sh + +create_sandbox +cat >>sandbox/etc/empire/econfig <>sandbox/etc/empire/econfig < BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970 + Play#0 output Play#0 1 Country #1 shelled sector 3,-1 for 25 damage. + Play#0 output Play#0 1 Country #1 shelled sector -1,-1 for 28 damage. + Play#0 output Play#0 1 Crumble... SCREEEECH! Splash! Bridge falls at -1,-1! + Play#0 output Play#0 1 Country #1 shelled sector 6,0 for 46 damage. + Play#0 output Play#0 1 Country #1 shelled sector 1,-3 for 23 damage. + Play#0 output Play#0 1 Crumble... SCREEEECH! Splash! Bridge tower falls at 1,-3! + Play#0 output Play#0 1 + Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970 + Play#0 output Play#0 1 Country #1 shelled sector 8,2 for 28 damage. + Play#0 output Play#0 1 Crumble... SCREEEECH! Splash! Bridge falls at 2,2! + Play#0 output Play#0 1 Country #1 shelled sector -1,3 for 23 damage. + Play#0 output Play#0 1 Crumble... SCREEEECH! Splash! Bridge falls at 1,3! + Play#0 output Play#0 1 Country #1 shelled sector -3,1 for 30 damage. + Play#0 output Play#0 1 Crumble... SCREEEECH! Splash! Bridge tower falls at -3,1! + Play#0 output Play#0 1 Country #1 shelled sector 8,2 for 35 damage. + Play#0 output Play#0 1 Crumble... SCREEEECH! Splash! Bridge falls at -1,1! + Play#0 output Play#0 1 Country #1 shelled sector 8,2 for 48 damage. + Play#0 output Play#0 1 Crumble... SCREEEECH! Splash! Bridge falls at -2,2! + Play#0 output Play#0 6 0 640 + Play#0 input ctld + Play#0 output Play#0 1 Bye-bye + Play#0 logout 0 + Play#0 output Play#0 3 so long... + Main shutdown diff --git a/tests/bridgefall/server.log b/tests/bridgefall/server.log new file mode 100644 index 00000000..6888e775 --- /dev/null +++ b/tests/bridgefall/server.log @@ -0,0 +1,34 @@ +------------------------------------------------------ +Empire server (pid 42) started +Configured for testing +Update schedule read +No update scheduled +Listening on 127.0.0.1 +Connect from 127.0.0.1 +Connect from 127.0.0.1 +tester@127.0.0.1 using country #1 +tester@127.0.0.1 logged in as country #1 +tester@127.0.0.1 logged out, country #1 +Connect from 127.0.0.1 +tester@127.0.0.1 using country #0 +tester@127.0.0.1 logged in as country #0 +tester@127.0.0.1 logged out, country #0 +Shutdown commencing (cleaning up threads.) +Server shutting down on signal 15 +------------------------------------------------------ +Empire server (pid 42) started +Configured for testing +Update schedule read +No update scheduled +Listening on 127.0.0.1 +Connect from 127.0.0.1 +Connect from 127.0.0.1 +tester@127.0.0.1 using country #1 +tester@127.0.0.1 logged in as country #1 +tester@127.0.0.1 logged out, country #1 +Connect from 127.0.0.1 +tester@127.0.0.1 using country #0 +tester@127.0.0.1 logged in as country #0 +tester@127.0.0.1 logged out, country #0 +Shutdown commencing (cleaning up threads.) +Server shutting down on signal 15 diff --git a/tests/bridgefall/setup-POGO b/tests/bridgefall/setup-POGO new file mode 100644 index 00000000..75577888 --- /dev/null +++ b/tests/bridgefall/setup-POGO @@ -0,0 +1,47 @@ +|| sectors +desi 0,0 c +desi 2,0 f +desi 1,-1:1 # +edit l 3,-1 e 100 s = S = +edit l -1:0,-2:-1 e 20 s = S = +edit l 1,-3 e 20 s @ S @ +edit l 2:3,-4:-2 e 100 s = S = +des 3,-5 + +des 8,2 - +edit l -2:3,1:2 ?des=. e 100 s = S = +edit l 1,3 e 100 s = S = +desi 3,3 # +desi -1,3 # +edit l 6,0 e 100 s @ S @ +edit l 8,0 e 100 s = S = +edit l -3,1 e 20 s @ S @ +| mark sectors of interest +terr * ?des== 1 +terr * ?des=# 1 +terr * ?des=@ 1 +| populate +give c * ?des#. 100 +edit l 0:2,0 e 100 +edit l * ?des=# e 20 +|| country#1 +add 1 1 1 p +edit c 1 s 4 b 640 M 25000 T 100 +give m 2,0 5 +give g 2,0 7 +give s 2,0 100 +edit l * ?des#.&des#=&des#@&des#- o 1 O 1 +edit l 0,-2 o 1 O 1 +edit l 3,1 o 1 O 1 +|| country#2 +add 2 2 2 p +| make country active, so it gets bulletins +edit c 2 s 4 b 640 M 25000 T 100 +edit l * ?des#.&own=0 o 2 O 2 +edit l -1,3 o 2 O 2 +|| relations +decl h 1 2 +decl h 2 1 +|| show initial state here to help maintainers +cens * ?des#. +comm * ?des#. +map *