From: Markus Armbruster Date: Sat, 10 Jan 2015 13:25:52 +0000 (+0100) Subject: tests: Wean off deprecated retreat syntax X-Git-Tag: v4.3.33~78 X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=c702dc9e94b7c24c653c89eb0da4284e2fbbba24 tests: Wean off deprecated retreat syntax Signed-off-by: Markus Armbruster --- diff --git a/tests/navi-march/99-POGO b/tests/navi-march/99-POGO index a7368f4b7..186ad0d26 100644 --- a/tests/navi-march/99-POGO +++ b/tests/navi-march/99-POGO @@ -6,9 +6,9 @@ read 5 read 6 ship * carg * ?shell#0 -retr * ?rflags#0 +retr * ?rflags#0 q miss s * ?mission#0 q land * lcar * ?shell#0 -lret * ?rflags#0 +lret * ?rflags#0 q miss l * ?mission#0 q diff --git a/tests/navi-march/journal.log b/tests/navi-march/journal.log index 27bafa4dc..bb328a591 100644 --- a/tests/navi-march/journal.log +++ b/tests/navi-march/journal.log @@ -1489,11 +1489,8 @@ Play#0 output Play#0 1 131 ms 11,-5 66% 0 3 0 14 0 0 0 0 0 0 0 0 0 Play#0 output Play#0 1 8 ships Play#0 output Play#0 6 0 640 - Play#0 input retr * ?rflags#0 + Play#0 input retr * ?rflags#0 q Play#0 command retreat - Play#0 output Play#0 1 Omitting the second argument is deprecated and will cease to work in a - Play#0 output Play#0 1 future release. Please use 'retr * ?rflags#0 q' to query retreat orders. - Play#0 output Play#0 1 Play#0 output Play#0 1 own shp# ship type x,y fl path as flt? flags Play#0 output Play#0 1 1 4 oe oil explora 1,1 hhhhn b Play#0 output Play#0 1 2 11 pt patrol boat 0,0 hhhhn b @@ -1599,11 +1596,8 @@ Play#0 output Play#0 1 131 eng 8,6 96% 0 5 0 3 0 0 0 0 0 0 0 0 0 Play#0 output Play#0 1 4 units Play#0 output Play#0 6 0 637 - Play#0 input lret * ?rflags#0 + Play#0 input lret * ?rflags#0 q Play#0 command lretreat - Play#0 output Play#0 1 Omitting the second argument is deprecated and will cease to work in a - Play#0 output Play#0 1 future release. Please use 'lret * ?rflags#0 q' to query retreat orders. - Play#0 output Play#0 1 Play#0 output Play#0 1 own lnd# unit type x,y ar path as army? flags Play#0 output Play#0 1 1 1 tra train 1,1 hhhhn b Play#0 output Play#0 1 1 4 eng engineer 1,1 hhhhn b diff --git a/tests/retreat/01-retreat-1 b/tests/retreat/01-retreat-1 index c48cd69e2..19d5002bf 100644 --- a/tests/retreat/01-retreat-1 +++ b/tests/retreat/01-retreat-1 @@ -10,7 +10,7 @@ junk | long path, all conditions retr 2/3 bgyujnbgyujnbgyujn itshbdu | clear retreat order -retr 3 h c +retr 3 h | group retreat order retr a ?uid=4 b h fleet a 7 @@ -30,7 +30,7 @@ junk | long path, all conditions lret 2/3 yujnbgyujnbgyujnbg ihb | clear retreat order -lret 3 h c +lret 3 h | group retreat order lret a ?uid=4 b h army a 7 diff --git a/tests/retreat/99-POGO b/tests/retreat/99-POGO index 2fdce0173..6a22813b6 100644 --- a/tests/retreat/99-POGO +++ b/tests/retreat/99-POGO @@ -1,8 +1,8 @@ read 1 read 2 ship * -retr * ?rflags#0 +retr * ?rflags#0 q miss s * ?mission#0 q land * -lretr * ?rflags#0 +lretr * ?rflags#0 q miss l * ?mission#0 q diff --git a/tests/retreat/journal.log b/tests/retreat/journal.log index f084bbe12..99d522c99 100644 --- a/tests/retreat/journal.log +++ b/tests/retreat/journal.log @@ -55,7 +55,7 @@ Play#1 output Play#1 1 3 lc light cruis -3,1 a bgyujnbgy itshbdu Play#1 output Play#1 1 2 ships Play#1 output Play#1 6 0 638 - Play#1 input retr 3 h c + Play#1 input retr 3 h Play#1 command retreat Play#1 output Play#1 1 shp# ship type x,y fl path as flt? flags Play#1 output Play#1 1 3 lc light cruis -3,1 a @@ -120,7 +120,7 @@ Play#1 output Play#1 1 3 inf infantry -3,1 a yujnbgyuj ihb Play#1 output Play#1 1 2 units Play#1 output Play#1 6 0 633 - Play#1 input lret 3 h c + Play#1 input lret 3 h Play#1 command lretreat Play#1 output Play#1 1 lnd# unit type x,y ar path as army? flags Play#1 output Play#1 1 3 inf infantry -3,1 a @@ -1596,11 +1596,8 @@ Play#0 output Play#0 1 2 130 tt troop trans -9,1 100% 0 10 0 0 0 0 0 0 96 60 Play#0 output Play#0 1 57 ships Play#0 output Play#0 6 0 640 - Play#0 input retr * ?rflags#0 + Play#0 input retr * ?rflags#0 q Play#0 command retreat - Play#0 output Play#0 1 Omitting the second argument is deprecated and will cease to work in a - Play#0 output Play#0 1 future release. Please use 'retr * ?rflags#0 q' to query retreat orders. - Play#0 output Play#0 1 Play#0 output Play#0 1 own shp# ship type x,y fl path as flt? flags Play#0 output Play#0 1 1 2 lc light cruis -3,1 bgyujnbgy itshbdu Play#0 output Play#0 1 1 4 lc light cruis -5,1 a b Yes h @@ -1700,11 +1697,8 @@ Play#0 output Play#0 1 2 64 cav cavalry 3,1 74% 7 0 73 0 50 42% 0 0 Play#0 output Play#0 1 35 units Play#0 output Play#0 6 0 637 - Play#0 input lretr * ?rflags#0 + Play#0 input lretr * ?rflags#0 q Play#0 command lretreat - Play#0 output Play#0 1 Omitting the second argument is deprecated and will cease to work in a - Play#0 output Play#0 1 future release. Please use 'lretr * ?rflags#0 q' to query retreat orders. - Play#0 output Play#0 1 Play#0 output Play#0 1 own lnd# unit type x,y ar path as army? flags Play#0 output Play#0 1 1 2 inf infantry -3,1 yujnbgyuj ihb Play#0 output Play#0 1 1 4 inf infantry -4,0 a b Yes h diff --git a/tests/retreat/setup-POGO b/tests/retreat/setup-POGO index 29e28ad31..b5088203a 100644 --- a/tests/retreat/setup-POGO +++ b/tests/retreat/setup-POGO @@ -228,7 +228,7 @@ decl f 2 4 map * cens * ?des#. ship * -retr * +retr * q land * -lretr * +lret * q plane *