From: Ron Koenderink Date: Sat, 27 Sep 2008 01:47:16 +0000 (-0600) Subject: Move test scripts from nightlybuild.sh to separate files X-Git-Tag: v4.3.18~7 X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=17f44e81047bb8ff381d8242a86a8773de444689 Move test scripts from nightlybuild.sh to separate files The test scripts are now in nightly/tests/TURN/PLAYER. For each turn, the update script is executed first (except for turn 00), and then all the player scripts in the appropriate turn directory. This runs runfeed() in different directories; change it to accomodate for that. The update script runs "report *" on all updates. Before, it ran only on some of them. --- diff --git a/src/scripts/nightly/common.sh b/src/scripts/nightly/common.sh index ee5052217..752f9fd33 100644 --- a/src/scripts/nightly/common.sh +++ b/src/scripts/nightly/common.sh @@ -29,6 +29,6 @@ runfeed() { [ -n "$REP" ] || REP="$1" { cat - } | ../bin/empire "$1" "$REP" || { warn "empire not ok ?" ; return 1 ; } + } | ${EMPIRE_PATH}/empire "$1" "$REP" || { warn "empire not ok ?" ; return 1 ; } return 0 } diff --git a/src/scripts/nightly/nightlybuild.sh b/src/scripts/nightly/nightlybuild.sh index 03e1a8a46..c3f792345 100755 --- a/src/scripts/nightly/nightlybuild.sh +++ b/src/scripts/nightly/nightlybuild.sh @@ -44,6 +44,7 @@ esac [ -f "${SCRIPTDIR}/common.sh" ] || { echo "Broken config ?" >&2; exit 1; } . "${SCRIPTDIR}"/common.sh +export SCRIPTDIR STAMP="`date +%Y%m%d%H%M%S`" @@ -348,6 +349,7 @@ fi *GENERATE*) ;; *) +export EMPIRE_PATH=${BOXDIR}/${WORKDIR}/emp4/bin echo "Running newcap_script through empire" runfeed POGO peter < newcap_script >/dev/null 2>&1 || { @@ -357,10 +359,6 @@ fi break } echo "Done (newcap_script / empire)." - echo "" - - echo "TODO: Replace this with a real test script." - echo "Just do some rudimentary testing for now." echo "" ;; @@ -377,639 +375,38 @@ fi *TESTSCRIPT*) ;; *) - for PLAYER in 2 3 4 5 6 7 8 9 10 +echo "Applying tests from ${BOXDIR}/${WORKDIR}/empserver/src/scripts/nightly/tests" +cd ${BOXDIR}/${WORKDIR}/empserver/src/scripts/nightly/tests +for i in * +do + [ -d "$i" ] || continue + cd "$i" + if [ "$i" -ne "00" ] + then + echo "Update Turn $i starting" + if ../update + then + echo "Update Turn $i completed successfully" + else + echo "Update Turn $i failed" + fi + + fi + for j in * do - echo "explore for player ${PLAYER}" - runfeed $PLAYER << EOF >/dev/null 2>&1 -break -expl c 0,0 1 uh -desi 1,-1 + -mov c 0,0 205 uh -desi 1,-1 g -cen * -EOF - echo "Done (explore)." - echo "" + [ -x "$j" ] || continue + echo "Player $j Turn $i starting" + if ./"$j" + then + echo "Player $j Turn $i completed successfully" + else + echo "Player $j Turn $i failed" + fi done - - # Something more elaborate for player 1 - echo "explore and more for player 1" - runfeed 1 << EOF >/dev/null 2>&1 -break -expl c 0,0 1 uh -expl c 2,0 1 jh -expl c 2,0 1 uh -expl c 2,0 1 nh -expl c 2,0 1 bh -expl c 0,0 1 yh -expl c 0,0 1 gh -expl c 0,0 1 bh -desi * ?ne=- + -expl c 2,0 1 njh -expl c 2,0 1 nnh -expl c 2,0 1 bnh -expl c 0,0 1 bbh -expl c 0,0 1 yyh -expl c 0,0 1 yuh -expl c 0,0 1 bnh -expl c 2,0 1 yuh -expl c 2,0 1 uuh -expl c 2,0 1 juh -desi * ?ne=- + -expl c 2,0 1 nnnh -expl c 2,0 1 nnjh -expl c 2,0 1 njjh -expl c 2,0 1 uujh -expl c 0,0 1 bbnh -expl c 0,0 1 bnnh -expl c 0,0 1 yygh -expl c 0,0 1 yuuh -desi * ?ne=- + -expl c 2,0 1 nnjjh -desi * ?ne=- + -expl c 2,0 1 nnjjjh -desi * ?ne=- + -mov u 0,0 75 jh -demob 0:2,0 55 y -desi 2,0 m -mov c 0,0 600 -1,-1 -desi -1,-1 g -mov c 0,0 275 1,-1 -mov c 2,0 274 1,-1 -desi 1,-1 m -deliver i 2,0 230 u -deliver i 1,-1 0 j -dist 4,0 2,0 -thres i 2,0 1 -des 0,-2 c -capital 0,-2 -des 0,0 g -thres d 0,0 1 -EOF - - echo "Run an update" - runfeed POGO peter << EOF -power new -cen * ?own#0 -comm * ?own#0 -reso * ?own#0 -force -EOF - echo "Done (force)." - echo "" - - sleep 10 - echo "Check player 1" - runfeed 1 << EOF -real 0 -8:12,-4:4 -cen * -map # -read y -EOF - echo "Done (check)." - echo "" - - echo "Check whether the update did anything" - runfeed POGO peter << EOF -power new -cen * ?own#0 -comm * ?own#0 -reso * ?own#0 -read -y -EOF - echo "Done (check update)." - echo "" - - echo "Continue some updates for player 1" - echo "" - - echo "Turn 2 for player 1" - - runfeed 1 << EOF >/dev/null 2>&1 -desi -1,-1 b -mov i 2,0 200 4,0 -mov i 1,-1 4 jh -mov c -1,-1 300 4,0 -mov c -1,-1 300 3,-1 -mov c 1,-1 175 3,-1 -deli i 2,0 0 j -deli i 1,-1 0 j -mov c 2,0 230 5,-1 -desi 4,0 k -desi 3,-1 j -dist # 5,-1 -thre h 4,0 1 -thre l 3,-1 1 -desi 5,-1 h -EOF - - echo "Run an update" - runfeed POGO peter << EOF -power new -cen * ?own#0 -comm * ?own#0 -reso * ?own#0 -force -EOF - echo "Done (force)." - echo "" - sleep 10 - - echo "Turn 3 for player 1" - runfeed 1 << EOF -cen * -map # -read y -build sh 5,-1 frg -mov l 5,-1 102 6,-2 -mov c 4,0 255 6,-2 -desi 6,-2 l -thre l 6,-2 150 -mov c 2,0 370 -2,2 -deliver i 2,0 0 j -deliver i 1,-1 0 j -thres d 1,1 1 -thres o -2,2 1 -thres i 2,0 0 -thres i 1,-1 0 -desi -2,2 o -desi 1,1 g -thres c -1:5,-1 768 -thres c -2:4,0 768 -thres c 6,-2 250 -thres c 4,-2 300 -thres l 4,-2 100 -thres o 4,-2 50 -thres d 4,-2 10 -thres d -1,-1 50 -thres c 1,1 768 -prod * -EOF - echo "Turn 3 for player 8" - runfeed 8 << EOF -cen * -map # -read y -exp c 0,0 50 gyyygh -des -7,-3 ) -lost * -EOF - - echo "Run an update" - runfeed POGO peter << EOF -power new -report * -cen * ?own#0 -comm * ?own#0 -reso * ?own#0 -force -EOF - echo "Done (force)." - echo "" - sleep 10 - - echo "Turn 4 for player 1" - runfeed 1 << EOF -cen * -ship * -map # -read y -des 4,-2 t -enlist 3,-1 50 -mov m 3,-1 50 5,-1 -load m 0 50 -nav 0 -j -j -h -assault 11,-1 0 -25 -prod * -EOF - echo "Turn 4 for player 8" - runfeed 8 << EOF -cen * -map # -read y -lost * -EOF - echo "Run an update" - runfeed POGO peter << EOF -power new -report * -cen * ?own#0 -comm * ?own#0 -reso * ?own#0 -force -EOF - echo "Done (force)." - echo "" - sleep 10 - - echo "Turn 5 for player 1" - runfeed 1 << EOF -real 0 -8:16,-4:4 -cen * -ship * -map # -read y -prod * -EOF - echo "Run an update" - runfeed POGO peter << EOF -power new -report * -cen * ?own#0 -comm * ?own#0 -reso * ?own#0 -force -EOF - - echo "Done (force)." - echo "" - sleep 10 - - echo "Turn 6 for player 1" - runfeed 1 << EOF -real 1 -16:24,-8:8 -convert 11,-1 76 -thres c -2,2 769 -mov c -2,2 47 0,2 -des 0:2,2 g -thres d 0:2,2 1 -thres c 0:2,2 769 -des 3,1 g -thres d 3,1 1 -thres c 3,1 769 -des 0,0 m -deliver i 0,0 0 g -thres d -1,-1 75 -thres d 0,0 0 -mov d 0,0 1 -1,-1 -thres c 0,-2 100 -thres c 4:6,-2 210 -thres c -1,-1 100 -thres i 4,0 999 -thres i 3,-1 999 -des -2,0 j -thres c -2,0 769 -thres l -2,0 1 -bmap #1 -nav 0 njnh -look 0 -radar 0 -radar 11,-1 -cen * -ship * -map # -read y -prod * -EOF - echo "Turn 6 for player 8" - runfeed 8 << EOF -exp c 0,0 1 gh -exp c 0,0 1 yh -exp c 0,0 1 ygh -exp c 0,0 1 yyh -exp c 0,0 1 yyyh -exp c 0,0 1 yyyyh -exp c 0,0 1 yygh -exp c 0,0 1 yygyh -exp c 0,0 1 yygyyh -exp c 0,0 1 bh -exp c 0,0 1 bgh -exp c 0,0 1 nh -exp c 0,0 1 njh -exp c 0,0 1 yuh -exp c 0,0 1 yuyh -exp c 0,0 1 yuuh -exp c 0,0 1 yuuyh -exp c 2,0 1 jh -exp c 2,0 1 jjh -exp c 2,0 1 jjjh -exp c 2,0 1 uh -exp c 2,0 1 ujh -exp c 2,0 1 ujjh -exp c 2,0 1 uyh -exp c 2,0 1 uuh -exp c 2,0 1 uujh -cen * -map # -read y -prod * -EOF - echo "Run an update" - runfeed POGO peter << EOF -power new -report * -cen * ?own#0 -comm * ?own#0 -reso * ?own#0 -force -EOF - - echo "Done (force)." - echo "" - sleep 10 - - echo "Turn 7 for player 1" - runfeed 1 << EOF -build bridge 5,-1 j -explore c 5,-1 1 jh -mov c 5,-1 76 7,-1 -thres c 7,-1 77 -dist * 5,-1 -des 1,1 m -deliver i 1,1 0 g -thres d 1,1 0 -mov d 1,1 1 -1,-1 -des -1,1 k -thres h -1,1 1 -thres c -1,1 769 -des -4:-2,-2 o -thres o -4:-2,-2 1 -thres c -4:-2,-2 769 -des 1,-3 o -thres o 1,-3 1 -thres c 1,-3 769 -des 4:8,2 g -thres d 4:8,2 1 -thres c 4:8,2 769 -thres c * ?c_dist=768 769 -bmap #1 -radar 11,-1 -cen * -ship * -map # -read y -prod * -EOF - echo "Turn 7 for player 8" - runfeed 8 << EOF -des 7,-1 c -capital 7,-1 -des * ?gold>1 g -thres d * ?newdes=g 1 -thres d * ?des=g 1 -thres d 4,0 0 -thres d 1,-1 1 -des -5,-3 o -thres o -5,-3 1 -des -6,-4 o -thres o -6,-4 1 -des 1,-1 m -thres i 1,-1 1 -des 3,1 w -dist * 3,1 -thres c 0:2,0 769 -thres c 1,-1 769 -thres c 4,0 350 -thres c 3,-1 769 -mov c 2,0 231 jh -mov c 0,0 231 jjh -mov c 1,-1 231 jh -bmap # -cen * -map # -read y -prod * -EOF - echo "Run an update" - runfeed POGO peter << EOF -power new -report * -cen * ?own#0 -comm * ?own#0 -reso * ?own#0 -force -EOF - - echo "Done (force)." - echo "" - sleep 10 - - echo "Turn 8 for player 1" - runfeed 1 << EOF -des 0,2 m -deliver i 0,2 0 j -thres d 0,2 0 -mov d 0,2 1 -1,-1 -des 3,1 m -deliver i 3,1 0 j -thres d 3,1 0 -mov d 3,1 1 -1,-1 -des 2,2 k -thres h 2,2 1 -thres d 2,2 0 -mov d 2,2 1 -1,-1 -thres d 4,-2 15 -thres o 4,-2 75 -thres l 4,-2 150 -des 5:7,1 g -thres d 5:7,1 1 -thres c 5:7,1 769 -des 10,2 g -thres d 10,2 1 -thres c 10,2 769 -radar 11,-1 -bmap #1 -cen * -ship * -map # -read y -prod * -EOF - echo "Turn 8 for player 8" - runfeed 8 << EOF -thres c -3:-1,-1 769 -des 0:2,0 m -thres i 0:2,0 1 -bmap # -cen * -map # -read y -prod * -EOF - - echo "Run an update" - runfeed POGO peter << EOF -power new -report * -cen * ?own#0 -comm * ?own#0 -reso * ?own#0 -force -EOF - - echo "Done (force)." - echo "" - sleep 10 - - echo "Turn 9 for player 1" - runfeed 1 << EOF -mov u 2,0 10 7,-1 -des -2,2 i -thres l -2,2 600 -thres h -2,2 300 -thres s -2,2 1 -thres o -2,2 0 -mov o -2,2 1 4,-2 -thres c * ?des#= 769 -bmap #1 -cen * -ship * -map # -read y -prod * -EOF - echo "Turn 9 for player 8" - runfeed 8 << EOF -thres d 1,-1 0 -mov d 1,-1 1 4,0 -des 3,-1 m -thres i 3,-1 1 -thres d 3,-1 0 -mov d 3,-1 1 4,0 -thres c -6,-4 769 -thres c 6,-2 769 -thres c 1,-3 769 -des 4,0 b -thres d 4,0 100 -thres d 0:2,0 0 -mov d 0,0 1 4,0 -mov d 2,0 1 4,0 -bmap # -cen * -map # -read y -prod * -EOF - - echo "Run an update" - runfeed POGO peter << EOF -power new -report * -cen * ?own#0 -comm * ?own#0 -reso * ?own#0 -force -EOF - - echo "Done (force)." - echo "" - sleep 10 - - echo "Turn 10 for player 1" - runfeed 1 << EOF -mov h 5,-1 100 7,-1 -build bridge 7,-1 j -explore c 7,-1 1 jh -thres c 9,-1 77 -mov u 7,-1 12 4,0 -thres u 2,0 579 -thres u 4,0 869 -thres u 11,-1 1 -thres l 6,-2 250 -des 7,1 d -thres l 7,1 200 -thres h 7,1 100 -thres o 7,1 20 -thres g 7,1 1 -thres d 7,1 0 -mov d 7,1 1 -1,-1 -des 5,1 j -thres l 5,1 1 -thres d 5,1 0 -mov d 5,1 1 -1,-1 -des 4,2 r -thres l 4,2 100 -thres o 4,2 50 -thres d 4,2 10 -des 6,2 w -thres d 6,2 0 -mov d 6,2 1 -1,-1 -des 8,2 e -thres d 8,2 0 -mov d 8,2 1 -1,-1 -thres m 8,2 1 -des 10,2 ! -thres l 10,2 200 -thres h 10,2 200 -thres s 10,2 200 -thres g 10,2 25 -thres d 10,2 0 -mov d 10,2 1 -1,-1 -des 5,3 p -thres l 5,3 75 -dist #1 5,-1 -spy 11,-1 -bmap #1 -cen * -ship * -map # -read y -prod * -EOF - echo "Turn 10 for player 8" - runfeed 8 << EOF -des -3,-1 j -thres i -3,-1 999 -thres l -3,-1 1 -thres c 6,0 769 -thres d -3,-1 0 -mov d -3,-1 1 4,0 -bmap # -cen * -map # -read y -prod * -EOF - echo "Run an update" - runfeed POGO peter << EOF -power new -report * -cen * ?own#0 -comm * ?own#0 -reso * ?own#0 -force -EOF - - echo "Done (force)." - echo "" - sleep 10 - - echo "Turn 11 for player 1" - runfeed 1 << EOF -thres l 6,-2 300 -thres l 5,-1 200 -thres h 5,-1 200 -thres i 5,-1 1 -thres o 5,-1 1 -thres d 5,-1 1 -dist #1 6,2 -bmap #1 -cen * -ship * -map # -read y -prod * -EOF - echo "Turn 11 for player 8" - runfeed 8 << EOF -des -1,-1 m -thres i -1,-1 1 -thres d -1,-1 0 -mov d -1,-1 1 4,0 -bmap # -cen * -map # -read y -prod * -EOF - - echo "Done (Rudimentary tests)." - echo "" + cd .. +done +echo "Done tests." +echo "" ;; esac diff --git a/src/scripts/nightly/tests/00/01 b/src/scripts/nightly/tests/00/01 new file mode 100755 index 000000000..775488d03 --- /dev/null +++ b/src/scripts/nightly/tests/00/01 @@ -0,0 +1,54 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 1 << EOF +break +expl c 0,0 1 uh +expl c 2,0 1 jh +expl c 2,0 1 uh +expl c 2,0 1 nh +expl c 2,0 1 bh +expl c 0,0 1 yh +expl c 0,0 1 gh +expl c 0,0 1 bh +desi * ?ne=- + +expl c 2,0 1 njh +expl c 2,0 1 nnh +expl c 2,0 1 bnh +expl c 0,0 1 bbh +expl c 0,0 1 yyh +expl c 0,0 1 yuh +expl c 0,0 1 bnh +expl c 2,0 1 yuh +expl c 2,0 1 uuh +expl c 2,0 1 juh +desi * ?ne=- + +expl c 2,0 1 nnnh +expl c 2,0 1 nnjh +expl c 2,0 1 njjh +expl c 2,0 1 uujh +expl c 0,0 1 bbnh +expl c 0,0 1 bnnh +expl c 0,0 1 yygh +expl c 0,0 1 yuuh +desi * ?ne=- + +expl c 2,0 1 nnjjh +desi * ?ne=- + +expl c 2,0 1 nnjjjh +desi * ?ne=- + +mov u 0,0 75 jh +demob 0:2,0 55 y +desi 2,0 m +mov c 0,0 600 -1,-1 +desi -1,-1 g +mov c 0,0 275 1,-1 +mov c 2,0 274 1,-1 +desi 1,-1 m +deliver i 2,0 230 u +deliver i 1,-1 0 j +dist 4,0 2,0 +thres i 2,0 1 +des 0,-2 c +capital 0,-2 +des 0,0 g +thres d 0,0 1 +EOF diff --git a/src/scripts/nightly/tests/00/02 b/src/scripts/nightly/tests/00/02 new file mode 100755 index 000000000..c9304a4f8 --- /dev/null +++ b/src/scripts/nightly/tests/00/02 @@ -0,0 +1,10 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 2 << 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/src/scripts/nightly/tests/00/03 b/src/scripts/nightly/tests/00/03 new file mode 100755 index 000000000..13b5cf527 --- /dev/null +++ b/src/scripts/nightly/tests/00/03 @@ -0,0 +1,10 @@ +#!/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/src/scripts/nightly/tests/00/04 b/src/scripts/nightly/tests/00/04 new file mode 100755 index 000000000..1741ae8e4 --- /dev/null +++ b/src/scripts/nightly/tests/00/04 @@ -0,0 +1,10 @@ +#!/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/src/scripts/nightly/tests/00/05 b/src/scripts/nightly/tests/00/05 new file mode 100755 index 000000000..9b27206c0 --- /dev/null +++ b/src/scripts/nightly/tests/00/05 @@ -0,0 +1,10 @@ +#!/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/src/scripts/nightly/tests/00/06 b/src/scripts/nightly/tests/00/06 new file mode 100755 index 000000000..2a12ff241 --- /dev/null +++ b/src/scripts/nightly/tests/00/06 @@ -0,0 +1,10 @@ +#!/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/src/scripts/nightly/tests/00/07 b/src/scripts/nightly/tests/00/07 new file mode 100755 index 000000000..5366bca3e --- /dev/null +++ b/src/scripts/nightly/tests/00/07 @@ -0,0 +1,10 @@ +#!/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/src/scripts/nightly/tests/00/08 b/src/scripts/nightly/tests/00/08 new file mode 100755 index 000000000..986c2f8a9 --- /dev/null +++ b/src/scripts/nightly/tests/00/08 @@ -0,0 +1,10 @@ +#!/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/src/scripts/nightly/tests/00/09 b/src/scripts/nightly/tests/00/09 new file mode 100755 index 000000000..d91cc9a88 --- /dev/null +++ b/src/scripts/nightly/tests/00/09 @@ -0,0 +1,10 @@ +#!/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/src/scripts/nightly/tests/00/10 b/src/scripts/nightly/tests/00/10 new file mode 100755 index 000000000..09106e9de --- /dev/null +++ b/src/scripts/nightly/tests/00/10 @@ -0,0 +1,10 @@ +#!/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/src/scripts/nightly/tests/01/01 b/src/scripts/nightly/tests/01/01 new file mode 100755 index 000000000..1c74624b9 --- /dev/null +++ b/src/scripts/nightly/tests/01/01 @@ -0,0 +1,8 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 1 << EOF +real 0 -8:12,-4:4 +cen * +map # +read y +EOF diff --git a/src/scripts/nightly/tests/02/01 b/src/scripts/nightly/tests/02/01 new file mode 100755 index 000000000..9bac43334 --- /dev/null +++ b/src/scripts/nightly/tests/02/01 @@ -0,0 +1,19 @@ +#!/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 +mov c -1,-1 300 4,0 +mov c -1,-1 300 3,-1 +mov c 1,-1 175 3,-1 +deli i 2,0 0 j +deli i 1,-1 0 j +mov c 2,0 230 5,-1 +desi 4,0 k +desi 3,-1 j +dist # 5,-1 +thre h 4,0 1 +thre l 3,-1 1 +desi 5,-1 h +EOF diff --git a/src/scripts/nightly/tests/03/01 b/src/scripts/nightly/tests/03/01 new file mode 100755 index 000000000..d8631e3f6 --- /dev/null +++ b/src/scripts/nightly/tests/03/01 @@ -0,0 +1,31 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 1 << EOF +cen * +map # +read y +build sh 5,-1 frg +mov l 5,-1 102 6,-2 +mov c 4,0 255 6,-2 +desi 6,-2 l +thre l 6,-2 150 +mov c 2,0 370 -2,2 +deliver i 2,0 0 j +deliver i 1,-1 0 j +thres d 1,1 1 +thres o -2,2 1 +thres i 2,0 0 +thres i 1,-1 0 +desi -2,2 o +desi 1,1 g +thres c -1:5,-1 768 +thres c -2:4,0 768 +thres c 6,-2 250 +thres c 4,-2 300 +thres l 4,-2 100 +thres o 4,-2 50 +thres d 4,-2 10 +thres d -1,-1 50 +thres c 1,1 768 +prod * +EOF diff --git a/src/scripts/nightly/tests/03/08 b/src/scripts/nightly/tests/03/08 new file mode 100755 index 000000000..491ef2254 --- /dev/null +++ b/src/scripts/nightly/tests/03/08 @@ -0,0 +1,10 @@ +#!/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/src/scripts/nightly/tests/04/01 b/src/scripts/nightly/tests/04/01 new file mode 100755 index 000000000..26a1e40cb --- /dev/null +++ b/src/scripts/nightly/tests/04/01 @@ -0,0 +1,19 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 1 << EOF +cen * +ship * +map # +read y +des 4,-2 t +enlist 3,-1 50 +mov m 3,-1 50 5,-1 +load m 0 50 +nav 0 +j +j +h +assault 11,-1 0 +25 +prod * +EOF diff --git a/src/scripts/nightly/tests/04/08 b/src/scripts/nightly/tests/04/08 new file mode 100755 index 000000000..3e2496b87 --- /dev/null +++ b/src/scripts/nightly/tests/04/08 @@ -0,0 +1,8 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 8 << EOF +cen * +map # +read y +lost * +EOF diff --git a/src/scripts/nightly/tests/05/01 b/src/scripts/nightly/tests/05/01 new file mode 100755 index 000000000..0bb6b9221 --- /dev/null +++ b/src/scripts/nightly/tests/05/01 @@ -0,0 +1,10 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 1 << EOF +real 0 -8:16,-4:4 +cen * +ship * +map # +read y +prod * +EOF diff --git a/src/scripts/nightly/tests/06/01 b/src/scripts/nightly/tests/06/01 new file mode 100755 index 000000000..408e8e756 --- /dev/null +++ b/src/scripts/nightly/tests/06/01 @@ -0,0 +1,37 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 1 << EOF +real 1 -16:24,-8:8 +convert 11,-1 76 +thres c -2,2 769 +mov c -2,2 47 0,2 +des 0:2,2 g +thres d 0:2,2 1 +thres c 0:2,2 769 +des 3,1 g +thres d 3,1 1 +thres c 3,1 769 +des 0,0 m +deliver i 0,0 0 g +thres d -1,-1 75 +thres d 0,0 0 +mov d 0,0 1 -1,-1 +thres c 0,-2 100 +thres c 4:6,-2 210 +thres c -1,-1 100 +thres i 4,0 999 +thres i 3,-1 999 +des -2,0 j +thres c -2,0 769 +thres l -2,0 1 +bmap #1 +nav 0 njnh +look 0 +radar 0 +radar 11,-1 +cen * +ship * +map # +read y +prod * +EOF diff --git a/src/scripts/nightly/tests/06/08 b/src/scripts/nightly/tests/06/08 new file mode 100755 index 000000000..9918af5fc --- /dev/null +++ b/src/scripts/nightly/tests/06/08 @@ -0,0 +1,34 @@ +#!/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 +exp c 0,0 1 yyh +exp c 0,0 1 yyyh +exp c 0,0 1 yyyyh +exp c 0,0 1 yygh +exp c 0,0 1 yygyh +exp c 0,0 1 yygyyh +exp c 0,0 1 bh +exp c 0,0 1 bgh +exp c 0,0 1 nh +exp c 0,0 1 njh +exp c 0,0 1 yuh +exp c 0,0 1 yuyh +exp c 0,0 1 yuuh +exp c 0,0 1 yuuyh +exp c 2,0 1 jh +exp c 2,0 1 jjh +exp c 2,0 1 jjjh +exp c 2,0 1 uh +exp c 2,0 1 ujh +exp c 2,0 1 ujjh +exp c 2,0 1 uyh +exp c 2,0 1 uuh +exp c 2,0 1 uujh +cen * +map # +read y +prod * +EOF diff --git a/src/scripts/nightly/tests/07/01 b/src/scripts/nightly/tests/07/01 new file mode 100755 index 000000000..565d1a249 --- /dev/null +++ b/src/scripts/nightly/tests/07/01 @@ -0,0 +1,33 @@ +#!/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 +thres c 7,-1 77 +dist * 5,-1 +des 1,1 m +deliver i 1,1 0 g +thres d 1,1 0 +mov d 1,1 1 -1,-1 +des -1,1 k +thres h -1,1 1 +thres c -1,1 769 +des -4:-2,-2 o +thres o -4:-2,-2 1 +thres c -4:-2,-2 769 +des 1,-3 o +thres o 1,-3 1 +thres c 1,-3 769 +des 4:8,2 g +thres d 4:8,2 1 +thres c 4:8,2 769 +thres c * ?c_dist=768 769 +bmap #1 +radar 11,-1 +cen * +ship * +map # +read y +prod * +EOF diff --git a/src/scripts/nightly/tests/07/08 b/src/scripts/nightly/tests/07/08 new file mode 100755 index 000000000..40ee9d840 --- /dev/null +++ b/src/scripts/nightly/tests/07/08 @@ -0,0 +1,31 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 8 << EOF +des 7,-1 c +capital 7,-1 +des * ?gold>1 g +thres d * ?newdes=g 1 +thres d * ?des=g 1 +thres d 4,0 0 +thres d 1,-1 1 +des -5,-3 o +thres o -5,-3 1 +des -6,-4 o +thres o -6,-4 1 +des 1,-1 m +thres i 1,-1 1 +des 3,1 w +dist * 3,1 +thres c 0:2,0 769 +thres c 1,-1 769 +thres c 4,0 350 +thres c 3,-1 769 +mov c 2,0 231 jh +mov c 0,0 231 jjh +mov c 1,-1 231 jh +bmap # +cen * +map # +read y +prod * +EOF diff --git a/src/scripts/nightly/tests/08/01 b/src/scripts/nightly/tests/08/01 new file mode 100755 index 000000000..ff44a87fd --- /dev/null +++ b/src/scripts/nightly/tests/08/01 @@ -0,0 +1,32 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 1 << EOF +des 0,2 m +deliver i 0,2 0 j +thres d 0,2 0 +mov d 0,2 1 -1,-1 +des 3,1 m +deliver i 3,1 0 j +thres d 3,1 0 +mov d 3,1 1 -1,-1 +des 2,2 k +thres h 2,2 1 +thres d 2,2 0 +mov d 2,2 1 -1,-1 +thres d 4,-2 15 +thres o 4,-2 75 +thres l 4,-2 150 +des 5:7,1 g +thres d 5:7,1 1 +thres c 5:7,1 769 +des 10,2 g +thres d 10,2 1 +thres c 10,2 769 +radar 11,-1 +bmap #1 +cen * +ship * +map # +read y +prod * +EOF diff --git a/src/scripts/nightly/tests/08/08 b/src/scripts/nightly/tests/08/08 new file mode 100755 index 000000000..4d5a7dd5e --- /dev/null +++ b/src/scripts/nightly/tests/08/08 @@ -0,0 +1,12 @@ +#!/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 +bmap # +cen * +map # +read y +prod * +EOF diff --git a/src/scripts/nightly/tests/09/01 b/src/scripts/nightly/tests/09/01 new file mode 100755 index 000000000..9e917444b --- /dev/null +++ b/src/scripts/nightly/tests/09/01 @@ -0,0 +1,18 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 1 << EOF +mov u 2,0 10 7,-1 +des -2,2 i +thres l -2,2 600 +thres h -2,2 300 +thres s -2,2 1 +thres o -2,2 0 +mov o -2,2 1 4,-2 +thres c * ?des#= 769 +bmap #1 +cen * +ship * +map # +read y +prod * +EOF diff --git a/src/scripts/nightly/tests/09/08 b/src/scripts/nightly/tests/09/08 new file mode 100755 index 000000000..9d0ae3457 --- /dev/null +++ b/src/scripts/nightly/tests/09/08 @@ -0,0 +1,23 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 8 << EOF +thres d 1,-1 0 +mov d 1,-1 1 4,0 +des 3,-1 m +thres i 3,-1 1 +thres d 3,-1 0 +mov d 3,-1 1 4,0 +thres c -6,-4 769 +thres c 6,-2 769 +thres c 1,-3 769 +des 4,0 b +thres d 4,0 100 +thres d 0:2,0 0 +mov d 0,0 1 4,0 +mov d 2,0 1 4,0 +bmap # +cen * +map # +read y +prod * +EOF diff --git a/src/scripts/nightly/tests/10/01 b/src/scripts/nightly/tests/10/01 new file mode 100755 index 000000000..e96608827 --- /dev/null +++ b/src/scripts/nightly/tests/10/01 @@ -0,0 +1,52 @@ +#!/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 +thres c 9,-1 77 +mov u 7,-1 12 4,0 +thres u 2,0 579 +thres u 4,0 869 +thres u 11,-1 1 +thres l 6,-2 250 +des 7,1 d +thres l 7,1 200 +thres h 7,1 100 +thres o 7,1 20 +thres g 7,1 1 +thres d 7,1 0 +mov d 7,1 1 -1,-1 +des 5,1 j +thres l 5,1 1 +thres d 5,1 0 +mov d 5,1 1 -1,-1 +des 4,2 r +thres l 4,2 100 +thres o 4,2 50 +thres d 4,2 10 +des 6,2 w +thres d 6,2 0 +mov d 6,2 1 -1,-1 +des 8,2 e +thres d 8,2 0 +mov d 8,2 1 -1,-1 +thres m 8,2 1 +des 10,2 ! +thres l 10,2 200 +thres h 10,2 200 +thres s 10,2 200 +thres g 10,2 25 +thres d 10,2 0 +mov d 10,2 1 -1,-1 +des 5,3 p +thres l 5,3 75 +dist #1 5,-1 +spy 11,-1 +bmap #1 +cen * +ship * +map # +read y +prod * +EOF diff --git a/src/scripts/nightly/tests/10/08 b/src/scripts/nightly/tests/10/08 new file mode 100755 index 000000000..f12a663c9 --- /dev/null +++ b/src/scripts/nightly/tests/10/08 @@ -0,0 +1,15 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 8 << EOF +des -3,-1 j +thres i -3,-1 999 +thres l -3,-1 1 +thres c 6,0 769 +thres d -3,-1 0 +mov d -3,-1 1 4,0 +bmap # +cen * +map # +read y +prod * +EOF diff --git a/src/scripts/nightly/tests/11/01 b/src/scripts/nightly/tests/11/01 new file mode 100755 index 000000000..5e6ef8ffd --- /dev/null +++ b/src/scripts/nightly/tests/11/01 @@ -0,0 +1,17 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 1 << EOF +thres l 6,-2 300 +thres l 5,-1 200 +thres h 5,-1 200 +thres i 5,-1 1 +thres o 5,-1 1 +thres d 5,-1 1 +dist #1 6,2 +bmap #1 +cen * +ship * +map # +read y +prod * +EOF diff --git a/src/scripts/nightly/tests/11/08 b/src/scripts/nightly/tests/11/08 new file mode 100755 index 000000000..4e326aae6 --- /dev/null +++ b/src/scripts/nightly/tests/11/08 @@ -0,0 +1,13 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 8 << EOF +des -1,-1 m +thres i -1,-1 1 +thres d -1,-1 0 +mov d -1,-1 1 4,0 +bmap # +cen * +map # +read y +prod * +EOF diff --git a/src/scripts/nightly/tests/update b/src/scripts/nightly/tests/update new file mode 100755 index 000000000..627069d96 --- /dev/null +++ b/src/scripts/nightly/tests/update @@ -0,0 +1,11 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed POGO peter << EOF +power new +report * +cen * ?own#0 +comm * ?own#0 +reso * ?own#0 +force +EOF +sleep 10