Test cleanup and reconvilation with advent430.

diff --git a/tests/boulder2.chk b/tests/boulder2.chk
index cdd7dbbeff656b0614f8c2962882a930007725e0..94303088d77b1b9b6c8e7573952573f0d35d7fb0 100644 (file)
--- a/tests/boulder2.chk
+++ b/tests/boulder2.chk
@@ -984,7 +984,7 @@ There is a huge beanstalk growing out of the west pit up to the hole.
 You are at the bottom of the eastern pit in the Twopit Room.  There is
 a small pool of oil in one corner of the pit.
 
-> g oil
+> get oil
 
 Your bottle is now full of oil.
 
@@ -1351,7 +1351,7 @@ You're in Giant Room.
 
 There is a large nest here, full of golden eggs!
 
-> g
+> get
 
 OK
 

diff --git a/tests/boulder2.log b/tests/boulder2.log
index ad4acd411128c0bf83dfb3e1ec9220d7c6f8303d..b52c757d9357d239dc9bd63b813f3ea99aa5a430 100644 (file)
--- a/tests/boulder2.log
+++ b/tests/boulder2.log
@@ -156,7 +156,7 @@ u
 drop appen
 e
 d
-g oil
+get oil
 u
 w
 d
@@ -220,7 +220,7 @@ w
 d
 climb
 w
-g
+get
 n
 take bottl
 n
@@ -239,4 +239,4 @@ fork
 ne
 e
 out
-e
\ No newline at end of file
+e

diff --git a/tests/hint_jade.chk b/tests/hint_jade.chk
index f16accf53e587e4592fcd5e7a1ab2048b2241e5d..fc9233bfb3c7558ac410317f8a4bd4ff0ca9fb4f 100644 (file)
--- a/tests/hint_jade.chk
+++ b/tests/hint_jade.chk
@@ -962,7 +962,7 @@ There is a huge beanstalk growing out of the west pit up to the hole.
 You are at the bottom of the eastern pit in the Twopit Room.  There is
 a small pool of oil in one corner of the pit.
 
-> g oil
+> get oil
 
 Your bottle is now full of oil.
 
@@ -1325,7 +1325,7 @@ You're in Giant Room.
 
 There is a large nest here, full of golden eggs!
 
-> g
+> get
 
 OK
 
@@ -1545,7 +1545,7 @@ There is a huge beanstalk growing out of the west pit up to the hole.
 
 You're in east pit.
 
-> g oil
+> get oil
 
 Your bottle is now full of oil.
 

diff --git a/tests/hint_jade.log b/tests/hint_jade.log
index d5550d07b5081478a82d5f6d9df250b576705c3b..58a44fe9b866ebb9a05dff226f2e6afba6fcdf0c 100644 (file)
--- a/tests/hint_jade.log
+++ b/tests/hint_jade.log
@@ -151,7 +151,7 @@ u
 drop appen
 e
 d
-g oil
+get oil
 u
 w
 d
@@ -214,7 +214,7 @@ w
 d
 climb
 w
-g
+get
 n
 take bottl
 n
@@ -249,7 +249,7 @@ se
 se
 w
 d
-g oil
+get oil
 u
 w
 w

diff --git a/tests/oldfilter b/tests/oldfilter
index a321792e6309b94037b4eb13e5419a337ac84c74..fcda48ed75a61633c3d16a065e6247e7ddc41032 100755 (executable)
--- a/tests/oldfilter
+++ b/tests/oldfilter
@@ -9,8 +9,11 @@ sed \
     -e '/persian/s//Persian/' \
     -e '/swiss/s//Swiss/' \
     -e '/eying/s//eyeing/' \
-    -e '/swiss/s//Swiss/' \
-    -e '/thresholds/s//threshholds/' \
+    -e '/threshhold/s//threshold/' \
+    -e '/NAGGING/s//nagging/' \
+    -e '/DOING/s//doing/' \
+    -e '/SOMETHING/s//something/' \
+    -e '/EW/s//ew/' \
 
 
 #end

diff --git a/tests/pirate_spotted.chk b/tests/pirate_spotted.chk
index 5cfc3c4ade0863307b6121ccdea329f03a17222b..b57d7e7b886bcbbaed97f2a6fb7d69e7e11223c4 100644 (file)
--- a/tests/pirate_spotted.chk
+++ b/tests/pirate_spotted.chk
@@ -984,7 +984,7 @@ There is a huge beanstalk growing out of the west pit up to the hole.
 You are at the bottom of the eastern pit in the Twopit Room.  There is
 a small pool of oil in one corner of the pit.
 
-> g oil
+> get oil
 
 Your bottle is now full of oil.
 
@@ -1351,7 +1351,7 @@ You're in Giant Room.
 
 There is a large nest here, full of golden eggs!
 
-> g
+> get
 
 OK
 
@@ -1547,7 +1547,7 @@ There is a huge beanstalk growing out of the west pit up to the hole.
 
 You're in east pit.
 
-> g oil
+> get oil
 
 Your bottle is now full of oil.
 

diff --git a/tests/pirate_spotted.log b/tests/pirate_spotted.log
index 1eeca5d77b4efbe43009336c1db35b6615cabb28..0c6512ae3cc310de71e6387278690f7163dc98ae 100644 (file)
--- a/tests/pirate_spotted.log
+++ b/tests/pirate_spotted.log
@@ -156,7 +156,7 @@ u
 drop appen
 e
 d
-g oil
+get oil
 u
 w
 d
@@ -220,7 +220,7 @@ w
 d
 climb
 w
-g
+get
 n
 take bottl
 n
@@ -250,7 +250,7 @@ se
 se
 w
 d
-g oil
+get oil
 u
 e
 w

diff --git a/tests/reach_ledge_short.chk b/tests/reach_ledge_short.chk
index c5e083e2cbbf0c60f8e67af37ff5726a81244e5e..d6f817556cb21c6f1a2db5191f05200095713700 100644 (file)
--- a/tests/reach_ledge_short.chk
+++ b/tests/reach_ledge_short.chk
@@ -1333,7 +1333,7 @@ There is a huge beanstalk growing out of the west pit up to the hole.
 
 You're in east pit.
 
-> g oil
+> get oil
 
 Your bottle is now full of oil.
 

diff --git a/tests/reach_ledge_short.log b/tests/reach_ledge_short.log
index a12133318fdc5766979938acf4449d7c71ad9164..2c33a0448027fdd7144101de9dc70acf994afd82 100644 (file)
--- a/tests/reach_ledge_short.log
+++ b/tests/reach_ledge_short.log
@@ -214,7 +214,7 @@ se
 se
 west
 d
-g oil
+get oil
 u
 west
 west

diff --git a/tests/troll_returns.chk b/tests/troll_returns.chk
index b4d7c2e0e238e7a7a7efc78aa379630317fe96c6..6b597d91cfdb4f4146aa5e55e886719510b60ba9 100644 (file)
--- a/tests/troll_returns.chk
+++ b/tests/troll_returns.chk
@@ -748,7 +748,7 @@ There is a huge beanstalk growing out of the west pit up to the hole.
 You are at the bottom of the eastern pit in the Twopit Room.  There is
 a small pool of oil in one corner of the pit.
 
-> g oil
+> get oil
 
 Your bottle is now full of oil.
 
@@ -803,7 +803,7 @@ You're in Giant Room.
 
 There is a large nest here, full of golden eggs!
 
-> g
+> take
 
 OK
 

diff --git a/tests/troll_returns.log b/tests/troll_returns.log
index 2b93a30ff46a0324f5af7bf783ca16315652c9d8..2697faf7f9cad70342045ea6d9726e3f23260435 100644 (file)
--- a/tests/troll_returns.log
+++ b/tests/troll_returns.log
@@ -119,7 +119,7 @@ water plant
 u
 e
 d
-g oil
+get oil
 u
 w
 d
@@ -128,7 +128,7 @@ w
 n
 oil door
 s
-g
+take
 n
 n
 w