Get rid of shell boilerplate in smoke test Empire batch files

diff --git a/tests/smoke-test b/tests/smoke-test
index 7344ccfa45d872c029bdec116aa945ffe31775b6..fe6d614dbb8fcb67753b6f35fc4d3aadaba76382 100755 (executable)
--- a/tests/smoke-test
+++ b/tests/smoke-test
@@ -87,7 +87,7 @@ EOF
        then c=POGO r=peter
        else c="${p#0}"; r="$c"
        fi
-       sed '1,3d;$d' <$j | src/client/empire "$c" "$r" >&3
+       src/client/empire "$c" "$r" <$j >&3
        echo "Player $p Turn $t completed successfully" >&3
     done
     need_update=y

diff --git a/tests/smoke/00/00 b/tests/smoke/00/00
index 42cdd1b608cf3ffa8f68f2560ac28842fd85193d..5771d74ad2ae8e033823cb391c387374ed54d674 100644 (file)
--- a/tests/smoke/00/00
+++ b/tests/smoke/00/00
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed POGO peter << EOF
 xdump meta sect
 xdump meta ship
 xdump meta plane
@@ -50,4 +47,3 @@ xdump meta retreat-flags
 xdump meta ship-chr-flags
 xdump meta treaty-flags
 xdump meta country
-EOF

diff --git a/tests/smoke/00/01 b/tests/smoke/00/01
index 11be30286c7eb6827156d22255b799e4abb5e545..163bcd8ec9bb80bc787d09a13cf8c214d9e00d61 100644 (file)
--- a/tests/smoke/00/01
+++ b/tests/smoke/00/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 xdump sect 0,0
 break
 expl c 0,0 1 uh
@@ -52,4 +49,3 @@ des 0,-2 c
 capital 0,-2
 des 0,0 g
 thres d 0,0 1
-EOF

diff --git a/tests/smoke/00/02 b/tests/smoke/00/02
index 9fb9b9a515dc4bc34c87c63ab17172449aeec077..60109f45b93b14ea95d4760fb3b2e1ff13e3b44f 100644 (file)
--- a/tests/smoke/00/02
+++ b/tests/smoke/00/02
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 2 << EOF
 break
 expl c 0,0 1 uh
 desi 1,-1 +
@@ -56,4 +53,3 @@ xdump meta retreat-flags
 xdump meta ship-chr-flags
 xdump meta treaty-flags
 xdump meta country
-EOF

diff --git a/tests/smoke/00/03 b/tests/smoke/00/03
index 13b5cf5275b722fb96f7e19661180a34fd2a536e..05f14c650f6b11354249befd5ab460441ccd4682 100644 (file)
--- a/tests/smoke/00/03
+++ b/tests/smoke/00/03
@@ -1,10 +1,6 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 3 << EOF
 break
 expl c 0,0 1 uh
 desi 1,-1 +
 mov c 0,0 205 uh
 desi 1,-1 g
 cen *
-EOF

diff --git a/tests/smoke/00/04 b/tests/smoke/00/04
index 1741ae8e4a19468c9fa9c502006caad3b745cae5..05f14c650f6b11354249befd5ab460441ccd4682 100644 (file)
--- a/tests/smoke/00/04
+++ b/tests/smoke/00/04
@@ -1,10 +1,6 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 4 << EOF
 break
 expl c 0,0 1 uh
 desi 1,-1 +
 mov c 0,0 205 uh
 desi 1,-1 g
 cen *
-EOF

diff --git a/tests/smoke/00/05 b/tests/smoke/00/05
index 9b27206c0a94f271ef3f830a614df18ad7474012..05f14c650f6b11354249befd5ab460441ccd4682 100644 (file)
--- a/tests/smoke/00/05
+++ b/tests/smoke/00/05
@@ -1,10 +1,6 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 5 << EOF
 break
 expl c 0,0 1 uh
 desi 1,-1 +
 mov c 0,0 205 uh
 desi 1,-1 g
 cen *
-EOF

diff --git a/tests/smoke/00/06 b/tests/smoke/00/06
index 2a12ff2418376e6ca82290f880ac57e913ec4c0d..05f14c650f6b11354249befd5ab460441ccd4682 100644 (file)
--- a/tests/smoke/00/06
+++ b/tests/smoke/00/06
@@ -1,10 +1,6 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 6 << EOF
 break
 expl c 0,0 1 uh
 desi 1,-1 +
 mov c 0,0 205 uh
 desi 1,-1 g
 cen *
-EOF

diff --git a/tests/smoke/00/07 b/tests/smoke/00/07
index 5366bca3e54ffc2113f5d721c99049aabb62af0e..05f14c650f6b11354249befd5ab460441ccd4682 100644 (file)
--- a/tests/smoke/00/07
+++ b/tests/smoke/00/07
@@ -1,10 +1,6 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 7 << EOF
 break
 expl c 0,0 1 uh
 desi 1,-1 +
 mov c 0,0 205 uh
 desi 1,-1 g
 cen *
-EOF

diff --git a/tests/smoke/00/08 b/tests/smoke/00/08
index 986c2f8a9c2429939cc5b6cb3fbde3fba51dce15..05f14c650f6b11354249befd5ab460441ccd4682 100644 (file)
--- a/tests/smoke/00/08
+++ b/tests/smoke/00/08
@@ -1,10 +1,6 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 break
 expl c 0,0 1 uh
 desi 1,-1 +
 mov c 0,0 205 uh
 desi 1,-1 g
 cen *
-EOF

diff --git a/tests/smoke/00/09 b/tests/smoke/00/09
index d91cc9a8896dd6789439ea666e1c9ffe4e72d6cc..05f14c650f6b11354249befd5ab460441ccd4682 100644 (file)
--- a/tests/smoke/00/09
+++ b/tests/smoke/00/09
@@ -1,10 +1,6 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 9 << EOF
 break
 expl c 0,0 1 uh
 desi 1,-1 +
 mov c 0,0 205 uh
 desi 1,-1 g
 cen *
-EOF

diff --git a/tests/smoke/00/10 b/tests/smoke/00/10
index 09106e9de1a0d11a90e1d9d60bfd3a695c81862b..05f14c650f6b11354249befd5ab460441ccd4682 100644 (file)
--- a/tests/smoke/00/10
+++ b/tests/smoke/00/10
@@ -1,10 +1,6 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 10 << EOF
 break
 expl c 0,0 1 uh
 desi 1,-1 +
 mov c 0,0 205 uh
 desi 1,-1 g
 cen *
-EOF

diff --git a/tests/smoke/01/01 b/tests/smoke/01/01
index 1c74624b96ca2ee2e202ee521eced648ee0fb65f..216e3da6b45d6e00356cc2adc9f8547f4f87fd24 100644 (file)
--- a/tests/smoke/01/01
+++ b/tests/smoke/01/01
@@ -1,8 +1,4 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 real 0 -8:12,-4:4
 cen *
 map #
 read y
-EOF

diff --git a/tests/smoke/02/01 b/tests/smoke/02/01
index 9bac43334419c78c2eb85abe89dfd5e21ec5c600..6e86bc3c881b1eab7da698f3643ef7e9258c6537 100644 (file)
--- a/tests/smoke/02/01
+++ b/tests/smoke/02/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 desi -1,-1 b
 mov i 2,0 200 4,0
 mov i 1,-1 4 jh
@@ -16,4 +13,3 @@ dist # 5,-1
 thre h 4,0 1
 thre l 3,-1 1
 desi 5,-1 h
-EOF

diff --git a/tests/smoke/03/01 b/tests/smoke/03/01
index d8631e3f67aed6655677c87093534e999d18fc7a..4d559faf5f463e3b0532c116b8ca0d620624f2e3 100644 (file)
--- a/tests/smoke/03/01
+++ b/tests/smoke/03/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 cen *
 map #
 read y
@@ -28,4 +25,3 @@ thres d 4,-2 10
 thres d -1,-1 50
 thres c 1,1 768
 prod *
-EOF

diff --git a/tests/smoke/03/08 b/tests/smoke/03/08
index 491ef2254b90dd11e1336d619f9d80a169fe6cc9..62c24d3ad5811b6c77943f348a4544c6e555e076 100644 (file)
--- a/tests/smoke/03/08
+++ b/tests/smoke/03/08
@@ -1,10 +1,6 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 cen *
 map #
 read y
 exp c 0,0 50 gyyygh
 des -7,-3 )
 lost *
-EOF

diff --git a/tests/smoke/04/01 b/tests/smoke/04/01
index 26a1e40cbf531054fbf38fc7af545db7dae5855e..36ca3d6b88ab82d5f8c8d66153618b91ea26034a 100644 (file)
--- a/tests/smoke/04/01
+++ b/tests/smoke/04/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 cen *
 ship *
 map #
@@ -16,4 +13,3 @@ h
 assault 11,-1 0
 25
 prod *
-EOF

diff --git a/tests/smoke/04/08 b/tests/smoke/04/08
index 3e2496b87052ee0ec23318e99e432027a1360cbd..a0adda1de1d73c0f54f41908a8152cdbc39166b0 100644 (file)
--- a/tests/smoke/04/08
+++ b/tests/smoke/04/08
@@ -1,8 +1,4 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 cen *
 map #
 read y
 lost *
-EOF

diff --git a/tests/smoke/05/01 b/tests/smoke/05/01
index 0bb6b9221b603979aa69408634849f3991c4858f..d0c977468397ed06198e996a9bd675420d3bf5cd 100644 (file)
--- a/tests/smoke/05/01
+++ b/tests/smoke/05/01
@@ -1,10 +1,6 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 real 0 -8:16,-4:4
 cen *
 ship *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/06/01 b/tests/smoke/06/01
index 93eed5ebd0b44c4dbf6f929d29d8d250aacaf2fd..4a00579b8ebf5f971289373de726e3c864e61031 100644 (file)
--- a/tests/smoke/06/01
+++ b/tests/smoke/06/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 real 1 -16:24,-8:8
 convert 11,-1 76
 thres c -2,2 769
@@ -34,4 +31,3 @@ ship *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/06/08 b/tests/smoke/06/08
index 9918af5fc7568b2b518ba0065877e988234ee14f..b91dade0b6e4916adfcaf6ca6d809d07cd9436e3 100644 (file)
--- a/tests/smoke/06/08
+++ b/tests/smoke/06/08
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 exp c 0,0 1 gh
 exp c 0,0 1 yh
 exp c 0,0 1 ygh
@@ -31,4 +28,3 @@ cen *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/07/01 b/tests/smoke/07/01
index 565d1a249aec06bb28603908bcd73edd8ab54a37..4144d7eb6e4eddfc81c333dacac538cf6cf834ae 100644 (file)
--- a/tests/smoke/07/01
+++ b/tests/smoke/07/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 build bridge 5,-1 j
 explore c 5,-1 1 jh
 mov c 5,-1 76 7,-1
@@ -30,4 +27,3 @@ ship *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/07/08 b/tests/smoke/07/08
index 40ee9d840dada6bf1b13952857b1155676a68104..5a3a495e088869469f21aba1967a9980165ea7d4 100644 (file)
--- a/tests/smoke/07/08
+++ b/tests/smoke/07/08
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 des 7,-1 c
 capital 7,-1
 des * ?gold>1 g
@@ -28,4 +25,3 @@ cen *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/08/01 b/tests/smoke/08/01
index ff44a87fd19ddde3a0df4c0969c8b427c035e301..962b9e433d9add68c76dfbf85d63d6187d3ec62e 100644 (file)
--- a/tests/smoke/08/01
+++ b/tests/smoke/08/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 des 0,2 m
 deliver i 0,2 0 j
 thres d 0,2 0
@@ -29,4 +26,3 @@ ship *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/08/08 b/tests/smoke/08/08
index 4d5a7dd5eeed18be3d95dd717c3d6572854bfd57..8d9ec31a24f8a4b8e3fd10ebfa95d1fec638985c 100644 (file)
--- a/tests/smoke/08/08
+++ b/tests/smoke/08/08
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 thres c -3:-1,-1 769
 des 0:2,0 m
 thres i 0:2,0 1
@@ -9,4 +6,3 @@ cen *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/09/01 b/tests/smoke/09/01
index 9de059877172c9569dcb63cefb20270e6d091c96..7ff3a457b0a68554371aeba2715a739efcffd549 100644 (file)
--- a/tests/smoke/09/01
+++ b/tests/smoke/09/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 mov u 2,0 10 7,-1
 des -2,2 i
 thres l -2,2 600
@@ -16,4 +13,3 @@ ship *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/09/08 b/tests/smoke/09/08
index f6c4a1230d03093d82dd3776a08008067486b8e2..41b8511fa6802541fae97d26526c846b9a1af51d 100644 (file)
--- a/tests/smoke/09/08
+++ b/tests/smoke/09/08
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 thres d 1,-1 0
 mov d 1,-1 1 4,0
 des 3,-1 m
@@ -21,4 +18,3 @@ cen *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/10/01 b/tests/smoke/10/01
index 691582e6c218dd22f67d3bff28de53699518fd2a..68d33d7d0daa9a66bb85645037aac0a84fa8fda8 100644 (file)
--- a/tests/smoke/10/01
+++ b/tests/smoke/10/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 mov h 5,-1 100 7,-1
 build bridge 7,-1 j
 explore c 7,-1 1 jh
@@ -51,4 +48,3 @@ ship *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/10/08 b/tests/smoke/10/08
index d2487f528686940ddf209874ec6375267b981701..53ee1105ddb38724b26e598cdeb74492c0fd234d 100644 (file)
--- a/tests/smoke/10/08
+++ b/tests/smoke/10/08
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 des -3,-1 j
 thres i -3,-1 999
 thres l -3,-1 1
@@ -15,4 +12,3 @@ cen *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/11/01 b/tests/smoke/11/01
index f64732b38c97f70f49e03d21157d03bb4f864811..1f42ff79479e1774e9d6bf80851aa3ef7814d1d9 100644 (file)
--- a/tests/smoke/11/01
+++ b/tests/smoke/11/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 thres l 6,-2 300
 thres l 5,-1 200
 thres h 5,-1 200
@@ -15,4 +12,3 @@ ship *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/11/08 b/tests/smoke/11/08
index 18aec92f5dd8fd90c6519c885e8f06faa5c845d9..fc17af9656f13438853a7f837adb8082b1e6abfc 100644 (file)
--- a/tests/smoke/11/08
+++ b/tests/smoke/11/08
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 des -1,-1 m
 thres i -1,-1 1
 thres d -1,-1 0
@@ -24,4 +21,3 @@ cen *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/12/01 b/tests/smoke/12/01
index 05e624479a525984079cef8f3aad66bb91c614e4..58c2106211f09ec0ac0a8c198dac76a30b276490 100644 (file)
--- a/tests/smoke/12/01
+++ b/tests/smoke/12/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 build l 10,2 cav 5
 build sh 5,-1 cs 3
 thres m 10,2 25
@@ -13,4 +10,3 @@ land *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/12/08 b/tests/smoke/12/08
index fea65f13d8e0eb5c814e805ee5bda1bb7153f236..0f5d99f0cb3fa69dde86817825aad6e45396168a 100644 (file)
--- a/tests/smoke/12/08
+++ b/tests/smoke/12/08
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 des 6,-2 t
 des 6,0 h
 thres d 6,0 0
@@ -18,4 +15,3 @@ cen *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/13/01 b/tests/smoke/13/01
index d1c3fa35e5758e398b444783167207c3bd744628..46f1e89dd9d13d3a9704405ae5efac713baec8d4 100644 (file)
--- a/tests/smoke/13/01
+++ b/tests/smoke/13/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 des -2,-2 j
 thres l -2,-2 1
 des -4,-2 k
@@ -59,4 +56,3 @@ land *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/13/02 b/tests/smoke/13/02
index 07c26b50e5d96ea45aaaa69da25830cb6c6961be..5f738b1164fa905aae03d388c2db68d18ea623b7 100644 (file)
--- a/tests/smoke/13/02
+++ b/tests/smoke/13/02
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 2 << EOF
 explore c 2,0  1 uh
 explore c 2,0  1 jh
 explore c 2,0  1 bh
@@ -90,4 +87,3 @@ cen *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/13/08 b/tests/smoke/13/08
index 319450c57cf1768258ceba3f85774da5d4a79e16..7bc22c26580ff41a24fa7fdd6521bac9851c2f00 100644 (file)
--- a/tests/smoke/13/08
+++ b/tests/smoke/13/08
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 thres c -2,0 769
 thres c 1,1 769
 thres c 5,-1 769
@@ -20,4 +17,3 @@ cen *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/14/01 b/tests/smoke/14/01
index 0c577c71dd3ef6289c1e766e1ff959db9bbe179e..141677dd10560c7d92a025b72314848f14678e06 100644 (file)
--- a/tests/smoke/14/01
+++ b/tests/smoke/14/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 lload m 4/5 5
 lload s 5 200
 lload g 5 20
@@ -27,4 +24,3 @@ plane *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/14/02 b/tests/smoke/14/02
index 27cd4a175d6af916d896f42404f502add242474c..dac7a05fc946f6e816f2645d319f4cac591e5af3 100644 (file)
--- a/tests/smoke/14/02
+++ b/tests/smoke/14/02
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 2 << EOF
 des 0:2,0 m
 thres i 0:2,0 1
 thres i -5,-1 999
@@ -22,4 +19,3 @@ cen *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/14/08 b/tests/smoke/14/08
index c4aafd71903b0a005d7f93e7e8bb115c7861fd00..65f743af3f8254cecdf5930df408d9e59651f3d2 100644 (file)
--- a/tests/smoke/14/08
+++ b/tests/smoke/14/08
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 thres c * 769
 thres i -2:0,-2 1
 des -2:0,-2 m
@@ -17,4 +14,3 @@ cen *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/15/01 b/tests/smoke/15/01
index 69560fad358c0e33fe508f398b2cc5b6dea3ed51..4569d87b65527c17cde18922b2a682632209401c 100644 (file)
--- a/tests/smoke/15/01
+++ b/tests/smoke/15/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 build p 11,-1 f1 3
 thres s 11,-1 200
 thres p 11,-1 200
@@ -23,4 +20,3 @@ plane *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/15/02 b/tests/smoke/15/02
index af0204a80d5f11adb844e854aac1e6b17e1eee9a..26ac4b5db760b5fd7184e6363bc6dbae85e8a26e 100644 (file)
--- a/tests/smoke/15/02
+++ b/tests/smoke/15/02
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 2 << EOF
 des -5,-1 j
 thres l -5,-1 1
 thres l 3,-1 300
@@ -12,4 +9,3 @@ cen *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/15/08 b/tests/smoke/15/08
index 001b5eee6f5883ef83a5608149129dc1913f8eeb..51547c04e55c61b9542e5a8e0b06a57bc97dde7c 100644 (file)
--- a/tests/smoke/15/08
+++ b/tests/smoke/15/08
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 des 5,-1 d
 thres g 5,-1 1
 des -6,-4 f
@@ -30,4 +27,3 @@ cen *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/16/01 b/tests/smoke/16/01
index ca98b4d5d66b0fd04217ba69ae072a84512267ef..4155d39895986743a5c0f398e513ddfd52b34e48 100644 (file)
--- a/tests/smoke/16/01
+++ b/tests/smoke/16/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 << EOF
 mov c 1,-1 230 jjh
 mov c 3,-1 230 jh
 mov c 2,-2 230 njh
@@ -34,4 +31,3 @@ plane *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/16/02 b/tests/smoke/16/02
index 73ebd39f116855c634dd28ee9eff50c562af6109..c32cf9636a39d1d6639faa9d41b21a203f5486bc 100644 (file)
--- a/tests/smoke/16/02
+++ b/tests/smoke/16/02
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 2 << EOF
 des 3,-1 l
 thres d 3,-1 0
 des 5,-1 k
@@ -17,4 +14,3 @@ cen *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/16/08 b/tests/smoke/16/08
index 593352f5822cc641b44c38c7599fcef6bfdf7209..4435ba6104154c51054e53a001dc379cbdd29d0e 100644 (file)
--- a/tests/smoke/16/08
+++ b/tests/smoke/16/08
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 8 << EOF
 des -4,-4 o
 thres o -4,-4 1
 thres o -5,-3 0
@@ -9,4 +6,3 @@ cen *
 map #
 read y
 prod *
-EOF

diff --git a/tests/smoke/99/00 b/tests/smoke/99/00
index c841d75c313e391a3f4f7fa822433138144f0ed3..e74905b09b8d94e804b0359a1fd7cb12a32e4436 100644 (file)
--- a/tests/smoke/99/00
+++ b/tests/smoke/99/00
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed POGO peter << EOF
 xdump sect 0,0
 xdump ship *
 xdump plane *
@@ -50,4 +47,3 @@ xdump retreat-flags *
 xdump ship-chr-flags *
 xdump treaty-flags *
 xdump country *
-EOF

diff --git a/tests/smoke/99/01 b/tests/smoke/99/01
index 1a9306c1fd4ba033f5dc17853e62caa828b6e625..b37a931b4f96f17502b6d5f2996f6c5c0f3cee02 100644 (file)
--- a/tests/smoke/99/01
+++ b/tests/smoke/99/01
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "${SCRIPTDIR}"/common.sh
-runfeed 1 1 << EOF
 xdump sect 0,0
 xdump ship *
 xdump plane *
@@ -50,4 +47,3 @@ xdump retreat-flags *
 xdump ship-chr-flags *
 xdump treaty-flags *
 xdump country *
-EOF