More test consolidation.

tests/bearbridge.chk

@@ -1625,6 +1625,10 @@ heard in the distance.
 You are standing at the entrance to a large, barren room.  A notice
 above the entrance reads:  "Caution!  Bear in room!"
 
+> drop food
+
+OK
+
 > in
 
 You are inside a barren room.  The center of the room is completely
@@ -1646,6 +1650,28 @@ probably just as well.
 
 > feed bear
 
+There's nothing here it wants to eat (except perhaps you).
+
+> out
+
+You're in front of Barren Room.
+
+There is food here.
+
+> take food
+
+OK
+
+> in
+
+You're in Barren Room.
+
+There is a ferocious cave bear eying you from the far end of the room!
+
+The bear is locked to the wall with a golden chain!
+
+> feed bear
+
 The bear eagerly wolfs down your food, after which he seems to calm
 down considerably and even becomes rather friendly.
 
@@ -1995,7 +2021,7 @@ There is no way across the fissure.
 You're on east bank of fissure.
 
 
-You scored 243 out of a possible 430, using 325 turns.
+You scored 243 out of a possible 430, using 330 turns.
 
 You may now consider yourself a "Seasoned Adventurer".
 

tests/bearbridge.log

@@ -1,4 +1,4 @@
-## Bear collapses bridge; also test bivalve predicates and unbridged fissure. 
+## Bridge destruction; also test bivalve predicates and bear feeding. 
 n
 seed 1838473132
 in
@@ -277,12 +277,17 @@ u
 toss eggs
 ne
 ne
-# Bear-verb test
+# Bear-verb test. Try feeding without food before feeding with
 barren
+drop food
 in
 attack
 unlock chain
 feed bear
+out
+take food
+in
+feed bear
 carry bear
 unlock chain
 take chain

tests/bearfeedfail.log

@@ -1,276 +0,0 @@
-## Feed bear with no food
-n
-seed 1838473132
-in
-take lamp
-xyzzy
-on
-take rod
-e
-take cage
-w
-w
-w
-drop rod
-take bird
-take rod
-w
-free bird
-wave rod
-take necklace
-drop rod
-take bird
-take rod
-d
-d
-free bird
-drop rod
-drop cage
-take cage
-take bird
-w
-take coins
-e
-s
-take jewelry
-n
-up
-s
-take gold
-n
-d
-n
-n
-plugh
-extinguish lamp
-drop coins
-drop jewelry
-drop necklace
-drop gold
-plugh
-on
-s
-take silver
-s
-sw
-take axe
-w
-kill dragon
-yes
-drink blood
-take rug
-e
-e
-up
-d
-n
-n
-off
-plugh
-inven
-drop rug
-drop silver
-out
-s
-w
-n
-take appendage
-free bird
-drop cage
-listen
-s
-s
-n
-in
-take water
-plugh
-on
-plover
-ne
-take pyramid
-s
-plover
-s
-s
-take rod
-up
-w
-wave rod
-drop rod
-west
-take diamonds
-w
-w
-w
-s
-sw
-se
-s
-kill machine
-s
-s
-kill ogre
-n
-take ruby
-s
-w
-n
-n
-n
-nw
-d
-e
-e
-e
-e
-e
-throw axe
-take axe
-n
-n
-n
-off
-plugh
-drop ruby
-drop diamonds
-drop pyramid
-plugh
-on
-s
-s
-u
-n
-n
-d
-bedquilt
-throw axe
-take axe
-slab
-s
-d
-water plant
-u
-w
-u
-reservoir
-H'CFL
-n
-n
-nw
-u
-u
-u
-u
-ne
-take ebony
-sw
-d
-d
-d
-d
-d
-take water
-s
-s
-s
-s
-d
-s
-d
-water plant
-u
-drop appendage
-e
-d
-get oil
-
-u
-w
-d
-climb
-w
-n
-oil door
-drop bottle
-n
-take trident
-w
-d
-se
-n
-w
-drop trident
-drop ebony
-drop axe
-drop lantern
-e
-take emerald
-w
-take lamp
-take axe
-take ebony
-take trident
-nw
-s
-take vase
-se
-throw axe
-take axe
-e
-take pillow
-w
-drop axe
-ne
-e
-n
-open clam
-s
-u
-e
-u
-n
-off
-plugh
-drop pillow
-drop vase
-drop trident
-drop emerald
-drop ebony
-take keys
-#take food
-plugh
-on
-s
-d
-w
-d
-n
-d
-d
-take pearl
-u
-u
-s
-w
-w
-w
-w
-d
-climb
-w
-get eggs
-n
-take bottle
-n
-w
-d
-sw
-u
-toss eggs
-ne
-ne
-barren
-in
-attack
-unlock chain
-feed bear