More test cleanup to converge with advent430 branch.

diff --git a/tests/carrybird.chk b/tests/carrybird.chk
index 55f6ac9971edf66ecf3d49aabbb9dfd7ab65b397..5b4b1de96beaa3064d1d83ba03dd14f3e786de88 100644 (file)
--- a/tests/carrybird.chk
+++ b/tests/carrybird.chk
@@ -51,10 +51,6 @@ has scrawled, "MAGIC WORD XYZZY".
 
 A three foot black rod with a rusty star on an end lies nearby.
 
 
 A three foot black rod with a rusty star on an end lies nearby.
 

-> eat grate
-
-I see no grate here.
-

 > w
 
 You are in an awkward sloping east/west canyon.
 > w
 
 You are in an awkward sloping east/west canyon.


@@ -76,7 +72,7 @@ You can catch the bird, but you cannot carry it.
 The little bird is now dead.  Its body disappears.
 
 > 
 The little bird is now dead.  Its body disappears.
 
 > 

-You scored 32 out of a possible 430, using 10 turns.
+You scored 32 out of a possible 430, using 9 turns.

 
 You are obviously a rank amateur.  Better luck next time.
 
 
 You are obviously a rank amateur.  Better luck next time.
 

diff --git a/tests/carrybird.log b/tests/carrybird.log
index 5f795482ccfb72e199098868fc38b20e435108e8..d57736cb27f1bd75fb3017bcb1dfa0760453b354 100644 (file)
--- a/tests/carrybird.log
+++ b/tests/carrybird.log
@@ -6,9 +6,8 @@ take lamp
 rub lamp
 xyzzy
 on
 rub lamp
 xyzzy
 on

-eat grate

 w
 w
 take bird
 # test intransitive attack on bird
 w
 w
 take bird
 # test intransitive attack on bird

-attack
\ No newline at end of file
+attack

diff --git a/tests/dwarf_alternative.chk b/tests/dwarf_alternative.chk
index d9adb0495a18ece39bc8b7cb8221cad12ea53eaa..1dae06b2c9e04ed9f399889ad2c4e13a197b9dfa 100644 (file)
--- a/tests/dwarf_alternative.chk
+++ b/tests/dwarf_alternative.chk
@@ -58,4 +58,12 @@ Oh dear, you seem to have gotten yourself killed.  I might be able to
 help you out, but I've never really done this before.  Do you want me
 to try to reincarnate you?
 
 help you out, but I've never really done this before.  Do you want me
 to try to reincarnate you?
 

-> 
\ No newline at end of file
+> n
+
+OK
+
+You scored 51 out of a possible 430, using 7 turns.
+
+Your score qualifies you as a novice class adventurer.
+
+To achieve the next higher rating, you need 70 more points.

diff --git a/tests/dwarf_alternative.log b/tests/dwarf_alternative.log
index 69a061993be541f2dea02ae1530e2bdfd8b63f70..590cb59437aa12e92e3fd627b28b67c8dcb98a53 100644 (file)
--- a/tests/dwarf_alternative.log
+++ b/tests/dwarf_alternative.log
@@ -8,3 +8,4 @@ w
 w
 d
 d
 w
 d
 d

+n

diff --git a/tests/flyback.log b/tests/flyback.log
index c4335de249436696ea932175ab8fce6f4c2e8786..059054e9a10d5af5131c4350f1f922c1e73a5341 100644 (file)
--- a/tests/flyback.log
+++ b/tests/flyback.log
@@ -1,4 +1,5 @@
 ## Test fix for issue #51: rug flying is broken
 ## Test fix for issue #51: rug flying is broken

+#NOCOMPARE Behavior differs due to a bug fix.

 n
 seed 1838473132
 in
 n
 seed 1838473132
 in

diff --git a/tests/hint_urn.log b/tests/hint_urn.log
index 8154e71e7aecbd2cd162d25717a979b37e38218b..926bc7d5bd05a004d3ec799b84c34d61c75db586 100644 (file)
--- a/tests/hint_urn.log
+++ b/tests/hint_urn.log
@@ -1,4 +1,5 @@
 ## Elicit hint for dealing with urn (fuzzed)
 ## Elicit hint for dealing with urn (fuzzed)

+#NOCOMPARE Policy decision - no point in emulating advent430's extra \n here

 n
 seed 1495951709
 u
 n
 seed 1495951709
 u


@@ -13,4 +14,4 @@ z
 z
 z
 y
 z
 z
 y

-y
\ No newline at end of file
+y

diff --git a/tests/hint_witt.log b/tests/hint_witt.log
index bafb070a0ecd9e495437bb1baa8811aadff59fa0..6127dd5dd40080b9bee3452e0bd4ea46216f18ab 100644 (file)
--- a/tests/hint_witt.log
+++ b/tests/hint_witt.log
@@ -1,4 +1,5 @@
 ## Hint for Witt's End
 ## Hint for Witt's End

+#NOCOMPARE Policy decision - no point in emulating advent430's extra \n here

 n
 seed 1635997320
 in
 n
 seed 1635997320
 in

diff --git a/tests/lampdim2.log b/tests/lampdim2.log
index 7004519ef64327c18ae0fb4c91d1fbb5631b0e61..14a615eb30b4ab9ec9664c4ebca460dda7b95349 100644 (file)
--- a/tests/lampdim2.log
+++ b/tests/lampdim2.log
@@ -426,4 +426,4 @@ n
 s
 n
 s
 s
 n
 s

-lamp on
\ No newline at end of file
+lamp on

diff --git a/tests/lampdim3.log b/tests/lampdim3.log
index cb8ba7abacb16eefe4db78ce80d85e9916861892..18f7e479538b694508f33130e89b7f797de2a54c 100644 (file)
--- a/tests/lampdim3.log
+++ b/tests/lampdim3.log
@@ -432,4 +432,4 @@ n
 s
 n
 up
 s
 n
 up

-down
\ No newline at end of file
+down

diff --git a/tests/lockchain.chk b/tests/lockchain.chk
index ff334a26ae837edbc7331dd35e1372e056bb976a..5645019be09b80fc05b9237363ef223c2bc4972b 100644 (file)
--- a/tests/lockchain.chk
+++ b/tests/lockchain.chk
@@ -1888,4 +1888,12 @@ Oh dear, you seem to have gotten yourself killed.  I might be able to
 help you out, but I've never really done this before.  Do you want me
 to try to reincarnate you?
 
 help you out, but I've never really done this before.  Do you want me
 to try to reincarnate you?
 

-> 
\ No newline at end of file
+> n
+
+OK
+
+You scored 219 out of a possible 430, using 328 turns.
+
+You may now consider yourself a "Seasoned Adventurer".
+
+To achieve the next higher rating, you need 32 more points.

diff --git a/tests/lockchain.log b/tests/lockchain.log
index a9db9e6484c30677138f3cd15017bf0a6a53ba93..bf9cd99ae60043def33f58389ddd3918fd9c4b29 100644 (file)
--- a/tests/lockchain.log
+++ b/tests/lockchain.log
@@ -334,3 +334,4 @@ s
 listen
 n
 jump
 listen
 n
 jump

+n

diff --git a/tests/ogre_no_dwarves.log b/tests/ogre_no_dwarves.log
index 1d5b269b5bce23871a296c03b116541fafc49ff6..fe51b5134b922e5e034280aa8bf4378885bb20f6 100644 (file)
--- a/tests/ogre_no_dwarves.log
+++ b/tests/ogre_no_dwarves.log
@@ -23,4 +23,4 @@ s
 kill machine
 s
 s
 kill machine
 s
 s

-attack
\ No newline at end of file
+attack

diff --git a/tests/reach_ledge_short.log b/tests/reach_ledge_short.log
index 2c33a0448027fdd7144101de9dc70acf994afd82..49c0f021cc7d43fbb2dbf50b9f2c0305f720543f 100644 (file)
--- a/tests/reach_ledge_short.log
+++ b/tests/reach_ledge_short.log
@@ -238,4 +238,4 @@ take amber
 drop rug
 drop emera
 fly
 drop rug
 drop emera
 fly

-e
\ No newline at end of file
+e