tests: Wean off deprecated retreat syntax

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/tests/navi-march/99-POGO b/tests/navi-march/99-POGO
index a7368f4b7788108672d058392bef3a972643d2f4..186ad0d269531eb5ba61db9762b7737d6faba4ca 100644 (file)
--- a/tests/navi-march/99-POGO
+++ b/tests/navi-march/99-POGO
@@ -6,9 +6,9 @@ read 5
 read 6
 ship *
 carg * ?shell#0
 read 6
 ship *
 carg * ?shell#0

-retr * ?rflags#0
+retr * ?rflags#0 q

 miss s * ?mission#0 q
 land *
 lcar * ?shell#0
 miss s * ?mission#0 q
 land *
 lcar * ?shell#0

-lret * ?rflags#0
+lret * ?rflags#0 q

 miss l * ?mission#0 q
 miss l * ?mission#0 q

diff --git a/tests/navi-march/journal.log b/tests/navi-march/journal.log
index 27bafa4dc3e7ed6a5cc6ebb480ff49d8aada9d2c..bb328a591561ac997d636a50bdfbc012c9c86b6a 100644 (file)
--- 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 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 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
     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 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 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
     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 c48cd69e28cdb6e1144e27589093a5001486e437..19d5002bf81ce0214c1a91b95ffdeb532150b48e 100644 (file)
--- 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
 | 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
 | 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
 | 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
 | 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 2fdce0173f70f405664eb7db3c712a2ee17504c0..6a22813b68d18608d1c65919043fae8b4a9abf08 100644 (file)
--- a/tests/retreat/99-POGO
+++ b/tests/retreat/99-POGO
@@ -1,8 +1,8 @@
 read 1
 read 2
 ship *
 read 1
 read 2
 ship *

-retr * ?rflags#0
+retr * ?rflags#0 q

 miss s * ?mission#0 q
 land *
 miss s * ?mission#0 q
 land *

-lretr * ?rflags#0
+lretr * ?rflags#0 q

 miss l * ?mission#0 q
 miss l * ?mission#0 q

diff --git a/tests/retreat/journal.log b/tests/retreat/journal.log
index f084bbe125008535f67c01f311a3c62360b45a9e..99d522c99064dac7750c0fa2d81dbf9327690079 100644 (file)
--- 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 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
     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 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
     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 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 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
     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 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 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
     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 29e28ad310b7355ff0a98c881802c3ff02bbc923..b5088203ab22b5f90d3eb568f212170909459ef7 100644 (file)
--- a/tests/retreat/setup-POGO
+++ b/tests/retreat/setup-POGO
@@ -228,7 +228,7 @@ decl f 2 4
 map *
 cens * ?des#.
 ship *
 map *
 cens * ?des#.
 ship *

-retr *
+retr * q

 land *
 land *

-lretr *
+lret * q

 plane *
 plane *