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>

diff --git a/tests/actofgod-test b/tests/actofgod-test
index e2184bdd89e6a484c29249ce62d4dd1ed0de14d9..f5d3e8e4c6ea83503852dbd5a5b5be05c1b5a6ff 100755 (executable)
--- a/tests/actofgod-test
+++ b/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
 

diff --git a/tests/actofgod/init_script b/tests/actofgod/init_script
deleted file mode 100644 (file)
index e15e149..0000000
--- a/tests/actofgod/init_script
+++ /dev/null
@@ -1,34 +0,0 @@
-edit c 0 T 400
-des * -
-des -12:11,0 .
-des -1:0,-8:7 .
-add 1 1 1 p
-add 2 2 2 p
-add 3 3 3 p
-add 4 4 4 p
-add 5 5 5 p
-add 6 6 6 v
-add 7 7 7 v
-add 98 98 98 g
-give m * 1
-setsect ow * ?xloc>0&yloc>0 1
-setsect ow * ?xloc<-1&yloc>0 2
-setsect ow * ?xloc>0&yloc<0 3
-give m * ?own=0 -1
-give c * ?own#0 1
-des 1,-1 h
-setse av 1,-1 9999
-give l 1,-1 9999
-give h 1,-1 9999
-give o 1,-1 9999
-give r 1,-1 9999
-give m 1,-1 999
-buil s 1,-1 cs 5 100
-des 1,-1 *
-buil p 1,-1 f1 5 100
-des 1,-1 !
-buil l 1,-1 sup 5 100
-des 1,-1 n
-buil n 1,-1 10kt 5
-edit l 3,-1 L 1,-1
-edit c 1/2/3/4/5 t 0 s 4

diff --git a/tests/actofgod/setup-POGO b/tests/actofgod/setup-POGO
new file mode 100644 (file)
index 0000000..e15e149
--- /dev/null
+++ b/tests/actofgod/setup-POGO
@@ -0,0 +1,34 @@
+edit c 0 T 400
+des * -
+des -12:11,0 .
+des -1:0,-8:7 .
+add 1 1 1 p
+add 2 2 2 p
+add 3 3 3 p
+add 4 4 4 p
+add 5 5 5 p
+add 6 6 6 v
+add 7 7 7 v
+add 98 98 98 g
+give m * 1
+setsect ow * ?xloc>0&yloc>0 1
+setsect ow * ?xloc<-1&yloc>0 2
+setsect ow * ?xloc>0&yloc<0 3
+give m * ?own=0 -1
+give c * ?own#0 1
+des 1,-1 h
+setse av 1,-1 9999
+give l 1,-1 9999
+give h 1,-1 9999
+give o 1,-1 9999
+give r 1,-1 9999
+give m 1,-1 999
+buil s 1,-1 cs 5 100
+des 1,-1 *
+buil p 1,-1 f1 5 100
+des 1,-1 !
+buil l 1,-1 sup 5 100
+des 1,-1 n
+buil n 1,-1 10kt 5
+edit l 3,-1 L 1,-1
+edit c 1/2/3/4/5 t 0 s 4

diff --git a/tests/fire-test b/tests/fire-test
index d2f9bb1d2ec4dbcacd8fd6b74af0b1186b2de098..4a76b697724a90a086f3a2384f4384eca383aa1e 100755 (executable)
--- a/tests/fire-test
+++ b/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
 

diff --git a/tests/fire/init_script b/tests/fire/init_script
deleted file mode 100644 (file)
index 3ddbfc6..0000000
--- a/tests/fire/init_script
+++ /dev/null
@@ -1,119 +0,0 @@
-|| pre-extend unit files
-edit c 0 T 400
-add 98 98 98 g
-des 0,0 h
-give m 0,0 100
-edit l 0,0 o 98 O 98 a 9999
-give l 0,0 9999
-give h 0,0 9999
-give o 0,0 9999
-give r 0,0 9999
-build s 0,0 frg
-edit s 0 O 0 T 0
-des 0,0 *
-build p 0,0 f1
-edit p 0 O 0 t 0
-des 0,0 !
-build l 0,0 cav
-edit u 0 O 0 t 0
-des 0,0 n
-build n 0,0 10kt
-edit n 0 O 0 t 0
-edit l 2,0 L 0,0
-|
-|| an island
-des @0,0:2 +
-edit l 4,2 e 100 s = S =
-edit l 1,3 e 20 s = S =
-give c * ?des#. 100
-|| country#1
-add 1 1 1 p
-des -2:4,0 f
-des 1,-1 c
-des 3,1 h
-edit l * ?des#. o 1 O 1
-give m -4:4,0 5
-give g -4:4,0 1
-give s -4:4,0 1
-edit l -2,0 e 4
-edit l 0,0 e 5
-give g 4,0 6
-give s 2:4,0 99
-edit c 1 c 1,-1 s 4 b 640 M 25000 T 100
-|| country#2
-| target harbor, highways, a strong bridge, a weak bridge
-des 2,2 h
-add 2 2 2 p
-edit l -2:4,2:3 ?des#. o 2 O 2
-give l * ?own=2 100
-give h * ?own=2 100
-edit l * ?own=2 a 100 R 100 r 100 d 100
-| make country active, so it gets bulletins
-edit c 2 s 4 b 640 M 25000 T 100
-|| country#3
-| just a sanctuary @ 2,-2
-des 2,-2 s
-add 3 3 3 p
-edit c 3 c 2,-2 b 640 M 25000
-|| finishing touches to land
-edit l * ?des#.&eff=0 e 100
-edit l * ?des#.&des#h m 127
-| note: no mob in harbor to avoid unwanted supply
-|| relations
-decl w 1 2
-decl w 2 1
-|| target ships
-| frg far away
-edit s 0 t frg L -12,0 O 2
-| sub at sea and in port
-edit s 10 t sb L 2,2 O 2 U 11 L 6,0
-edit s 10 U 12 m 5 E 100 M 127 U 13 L 6,0
-| cs at sea and in port
-edit s 20 t cs L 2,2 O 2 l 100 h 100 U 21 L 6,0
-edit s 20 U 22 m 5 E 100 M 127 U 23 L 6,0 U 24
-retreat 11/13/23 j idh
-retreat 10/12/22 n dh
-|| target lands
-| spy in target harbor
-edit u 0 T spy L 2,2 O 2 e 100 M 127
-| spy on target subs
-edit u 0 U 10 S 10 U 11 S 11 U 12 S 12 U 13 S 13
-| rad on target cs
-edit u 20 T rad O 2 e 100 M 127 m 10 S 20 U 21 S 21 U 22 S 22 U 23 S 23
-| train on weak target bridge
-edit u 30 T tra L 1,3 O 2 e 100 m 10 l 100 h 100 M 127 U 32 L 2,2
-| tra in target harbor
-edit u 31 T rad O 2 e 100 M 127 m 10 Y 30 U 33 Y 32
-|| target planes
-| sam & jhb in target harbor, jhb ob weak target bridge
-edit p 0 T sam l 2,2 O 2 e 100 m 127
-edit p 1 T jhb l 2,2 O 2 e 100 m 127 U 2 l 1,3
-| sam in target cs and rad
-edit p 0 U 20 s 20 U 21 s 21 U 22 s 22 U 23 s 23
-edit p 0 U 30 y 30 U 31 y 31 U 32 y 32 U 33 y 33
-|| target nukes in target harbor and on target jhb
-edit n 0 t 10kt L 2,2 O 2 U 1 p 1 U 2 p 2
-|| firing ships
-| bb range >=3, 59% 60% 100%
-edit s 1 t bb T 150 L 3,1 O 1 E 59 M 127 m 13 g 10 s 200 U 2 E 60 U 3 E 100
-| cs
-edit s 9 t cs L 3,1 O 1 E 100 M 127 m 10 g 10 s 10
-| dd range 1.5
-edit s 5 t dd T 100 L 8,0 O 1 E 100 M 127 m 5 g 4 s 40
-edit s 5 U 6 L 3,3
-|| firing lands
-| hat range 3.5 39% 40% 100%
-edit u 1 T hat t 160 L 3,1 O 1 e 39 M 127 m 10 g 12 s 80 U 2 e 40 U 3 e 100
-| tra
-edit u 9 T tra L 3,1 O 1 e 100 m 10 g 10 s 10
-| note: no mob in train to avoid unwanted supply
-|| show initial state here to help maintainers
-map *
-cens * ?own#0
-comm * ?own#0
-ship *
-carg *
-land *
-lcar *
-plan *
-nuke *

diff --git a/tests/fire/setup-POGO b/tests/fire/setup-POGO
new file mode 100644 (file)
index 0000000..3ddbfc6
--- /dev/null
+++ b/tests/fire/setup-POGO
@@ -0,0 +1,119 @@
+|| pre-extend unit files
+edit c 0 T 400
+add 98 98 98 g
+des 0,0 h
+give m 0,0 100
+edit l 0,0 o 98 O 98 a 9999
+give l 0,0 9999
+give h 0,0 9999
+give o 0,0 9999
+give r 0,0 9999
+build s 0,0 frg
+edit s 0 O 0 T 0
+des 0,0 *
+build p 0,0 f1
+edit p 0 O 0 t 0
+des 0,0 !
+build l 0,0 cav
+edit u 0 O 0 t 0
+des 0,0 n
+build n 0,0 10kt
+edit n 0 O 0 t 0
+edit l 2,0 L 0,0
+|
+|| an island
+des @0,0:2 +
+edit l 4,2 e 100 s = S =
+edit l 1,3 e 20 s = S =
+give c * ?des#. 100
+|| country#1
+add 1 1 1 p
+des -2:4,0 f
+des 1,-1 c
+des 3,1 h
+edit l * ?des#. o 1 O 1
+give m -4:4,0 5
+give g -4:4,0 1
+give s -4:4,0 1
+edit l -2,0 e 4
+edit l 0,0 e 5
+give g 4,0 6
+give s 2:4,0 99
+edit c 1 c 1,-1 s 4 b 640 M 25000 T 100
+|| country#2
+| target harbor, highways, a strong bridge, a weak bridge
+des 2,2 h
+add 2 2 2 p
+edit l -2:4,2:3 ?des#. o 2 O 2
+give l * ?own=2 100
+give h * ?own=2 100
+edit l * ?own=2 a 100 R 100 r 100 d 100
+| make country active, so it gets bulletins
+edit c 2 s 4 b 640 M 25000 T 100
+|| country#3
+| just a sanctuary @ 2,-2
+des 2,-2 s
+add 3 3 3 p
+edit c 3 c 2,-2 b 640 M 25000
+|| finishing touches to land
+edit l * ?des#.&eff=0 e 100
+edit l * ?des#.&des#h m 127
+| note: no mob in harbor to avoid unwanted supply
+|| relations
+decl w 1 2
+decl w 2 1
+|| target ships
+| frg far away
+edit s 0 t frg L -12,0 O 2
+| sub at sea and in port
+edit s 10 t sb L 2,2 O 2 U 11 L 6,0
+edit s 10 U 12 m 5 E 100 M 127 U 13 L 6,0
+| cs at sea and in port
+edit s 20 t cs L 2,2 O 2 l 100 h 100 U 21 L 6,0
+edit s 20 U 22 m 5 E 100 M 127 U 23 L 6,0 U 24
+retreat 11/13/23 j idh
+retreat 10/12/22 n dh
+|| target lands
+| spy in target harbor
+edit u 0 T spy L 2,2 O 2 e 100 M 127
+| spy on target subs
+edit u 0 U 10 S 10 U 11 S 11 U 12 S 12 U 13 S 13
+| rad on target cs
+edit u 20 T rad O 2 e 100 M 127 m 10 S 20 U 21 S 21 U 22 S 22 U 23 S 23
+| train on weak target bridge
+edit u 30 T tra L 1,3 O 2 e 100 m 10 l 100 h 100 M 127 U 32 L 2,2
+| tra in target harbor
+edit u 31 T rad O 2 e 100 M 127 m 10 Y 30 U 33 Y 32
+|| target planes
+| sam & jhb in target harbor, jhb ob weak target bridge
+edit p 0 T sam l 2,2 O 2 e 100 m 127
+edit p 1 T jhb l 2,2 O 2 e 100 m 127 U 2 l 1,3
+| sam in target cs and rad
+edit p 0 U 20 s 20 U 21 s 21 U 22 s 22 U 23 s 23
+edit p 0 U 30 y 30 U 31 y 31 U 32 y 32 U 33 y 33
+|| target nukes in target harbor and on target jhb
+edit n 0 t 10kt L 2,2 O 2 U 1 p 1 U 2 p 2
+|| firing ships
+| bb range >=3, 59% 60% 100%
+edit s 1 t bb T 150 L 3,1 O 1 E 59 M 127 m 13 g 10 s 200 U 2 E 60 U 3 E 100
+| cs
+edit s 9 t cs L 3,1 O 1 E 100 M 127 m 10 g 10 s 10
+| dd range 1.5
+edit s 5 t dd T 100 L 8,0 O 1 E 100 M 127 m 5 g 4 s 40
+edit s 5 U 6 L 3,3
+|| firing lands
+| hat range 3.5 39% 40% 100%
+edit u 1 T hat t 160 L 3,1 O 1 e 39 M 127 m 10 g 12 s 80 U 2 e 40 U 3 e 100
+| tra
+edit u 9 T tra L 3,1 O 1 e 100 m 10 g 10 s 10
+| note: no mob in train to avoid unwanted supply
+|| show initial state here to help maintainers
+map *
+cens * ?own#0
+comm * ?own#0
+ship *
+carg *
+land *
+lcar *
+plan *
+nuke *

diff --git a/tests/test-common.sh b/tests/test-common.sh
index 35352195c5f04a18836dd1a3fcceea8173dad2ff..a2e22cc077e8975519e9220d093424b924e748da 100644 (file)
--- a/tests/test-common.sh
+++ b/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
 }