Version Spin_merge taken

7f784e88 · Neil Turton · ed047dcd · 7f784e88 · 7f784e88 · 7f784e88
Commit 7f784e88 authored 28 years ago by Neil Turton
20 changed files
--- a/Test/Many/!Run,feb
+++ b/Test/Many/!Run,feb
@@ -12,8 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-|> !Run
-
-WimpSlot 64k 64k
-
-Run <Obey$Dir>.ManyTest
--- a/Test/Many/ManyTest,ffb
+++ b/Test/Many/ManyTest,ffb
--- a/Test/Many/Templates,fec
+++ b/Test/Many/Templates,fec
--- a/Test/Multi/!Run,feb
+++ b/Test/Multi/!Run,feb
@@ -12,8 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-|> !Run
-
-WimpSlot 64k 64k
-
-Run <Obey$Dir>.MultiTest
--- a/Test/Multi/!Sprites,ff9
+++ b/Test/Multi/!Sprites,ff9
--- a/Test/Multi/MultiTest,ffb
+++ b/Test/Multi/MultiTest,ffb
--- a/Test/Multi/Templates,fec
+++ b/Test/Multi/Templates,fec
--- a/Test/Nest1/!Run,feb
+++ b/Test/Nest1/!Run,feb
@@ -12,8 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-|> !Run
-
-WimpSlot 64k 64k
-
-Run <Obey$Dir>.WindowTest
--- a/Test/Nest1/Templates,fec
+++ b/Test/Nest1/Templates,fec
--- a/Test/Nest1/WindowTest,ffb
+++ b/Test/Nest1/WindowTest,ffb
--- a/Test/Nest2/!Run,feb
+++ b/Test/Nest2/!Run,feb
@@ -12,10 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-|> !Run
-
-Set WimpTest2$Dir <Obey$Dir>
-
-WimpSlot 2200k 2200k
-
-Run <Obey$Dir>.WindowTest
--- a/Test/Nest2/Log
+++ b/Test/Nest2/Log
-Current  21BB0B9       34      174      15E      280       8A FFFFFE92  21BB419 8001F742  21BC4F9        0
-Current  21BC2B9      37C       56      420      1CC       80 FFFFFE90 FFFFFFFF 8003F742  21BBF59  8150000
-Current  21BC079      35C      21E      3D0      24E      100 FFFFFEB0 FFFFFFFF C5030002  21BAF99  5900000
-Current  21BB1D9      5AC       A6      6A6      138       C4 FFFFFEA4  21B9379 F8010002  21BC3D9   A80000
-Current  21BB9B9      2DE       90      304       A0       CA FFFFFEC2  21B8D09 C0810002  21BC199  5180000
-Current  21B9499      232       18      2BC       3E        8 FFFFFEB0 FFFFFFFF BD030002  21B8D09  AA20000
-Current  21BC4F9      7D2 FFFFFFCE      9C2       6A       B2 FFFFFE94 FFFFFFFF 8003F742  21B9379  4AA0000
-Current  21BB539      1C6      1FC      1FC      346       A4 FFFFFE6C  21B8BE9 D487F742  21BB9B9   840000
-Current  21BB779 FFFFFF28      2FE      122      384       DE FFFFFEEA FFFFFFFF C080F742 FFFFFFFF  2640000
-Current  21BBE39      35C      21E      3D0      274       E4 FFFFFEB2 FFFFFFFF C0870002  21BC079    40000
-Current  21BB659      3DA FFFFFF74      440       80       F4 FFFFFE6A FFFFFFFF E0030002  21BC3D9  5850000
-Current  21BC3D9      2DE       70      358       7A       E6 FFFFFEB2 FFFFFFFF 8D870002  21B8BE9        0
-Current  21BBF59      406 FFFFFFC0      480 FFFFFFEE       B8 FFFFFE86  21BC199 8F03F742 FFFFFFFF  1410000
-Current  21BB2F9      2E6 FFFFFF7A      354 FFFFFF7A       F0 FFFFFE74 FFFFFFFF D4000002 FFFFFFFF  2920000
-Current  21BC199      2DE       24      4D2       7A       CC FFFFFEB4  21BBAD9 84030002 FFFFFFFF  2180000
-Current  21B9379      400        2      682       E6       E6 FFFFFEB2  21BB659 ED010002  21BC3D9        0
-Current  21BBBF9      2E6      1E4      40E      1F0       F6 FFFFFF0A FFFFFFFF D4030002  21BB659  8010000
-Current  21BB419       6A FFFFFFD6      21C      156       96 FFFFFE92 FFFFFFFF FF03F742  21BC4F9    10000
-Current  21BAF99      306      288      4CE      2EA       92 FFFFFE92 FFFFFFFF F803F742  21BB9B9        0
-Current  21BB899      240       4E      25E       58       CE FFFFFE9A FFFFFFFF D0830002  21B9499  9250000
-Current  21BBD19      276       76      312      1EA       E0 FFFFFEB6 FFFFFFFF F7030002  21BBBF9   120000
-Current  21BBAD9        8      2EE      10A      344       E8 FFFFFEAC FFFFFFFF FF030002 FFFFFFFF        0
-Current  21B8BE9      2DE       70      332       7A       B8 FFFFFEB2  21BAF99 9F830002  21BB9B9  8020000
-Current  21B8AC9       EC       94      200      24E       E4 FFFFFEB4 FFFFFFFF B7030002  21BB0B9        0
-Current  21B8D09      248       9C      3F8      24A       88 FFFFFE8A FFFFFFFF D803F742  21BC199  1260000
-Old      21BBF59      406 FFFFFFC0      480 FFFFFFEE       B8 FFFFFE86  21BC199 8F03F742 FFFFFFFF  1410000
-Open     21BBF59      407 FFFFFFC0      47C FFFFFFF4       B7 FFFFFE84 FFFFFFFF 8F03F742  21BC2B9  1410000
--- a/Test/Nest2/Log1
+++ b/Test/Nest2/Log1
-Current  22AF099      130      35C      162      362      102 FFFFFED0 FFFFFFFF 95030002 FFFFFFFF   160000
-Current  22AEF79     6838      20C     699E      2F8       D0 FFFFFEAE  22B3179 FC030002  22B13A9  42A0000
-Current  22B13A9     68B8      39C     6B14      3EE       80 FFFFFE66 FFFFFFFF F887F752  22B3059  9480000
-Current  22B3179 FFFFFE88      4C6       12      4F2       64 FFFFFE42 FFFFFFFF D083F752  22B13A9  9960000
-Current  22B3059      130      382      188      362       D4 FFFFFEB4 FFFFFFFF CF870002  22AF099  A490000
--- a/Test/Nest2/Log2
+++ b/Test/Nest2/Log2
-Current  2297CB9       34      174      15E      280       8A FFFFFE92  229D269 FF01F742        0        0
-Current  2297C09      37C       56      420      1CC       80 FFFFFE90  229CC19 FF01F742        0        0
-Current  229CC19      35C      1D8      3D2      24E      100 FFFFFEB0  229D3C9 FF010002        0        0
-Current  229CB69      5AC       A6      6A6      138       C4 FFFFFEA4  2297CB9 FF010002        0        0
-Current  229CAB9      2DE       2A      354       A0       CA FFFFFEC2  2297C09 FF010002        0        0
-Current  229D3C9      232 FFFFFFC8      2BC       3E        8 FFFFFEB0  229D319 FF010002        0        0
-Current  229D319      7D2 FFFFFFCE      9C2       6A       B2 FFFFFE94  229D749 FF03F742        0        0
-Current  229D269      1C6      1FC      23C      346       A4 FFFFFE6C  229EDE9 FF01F742        0        0
-Current  229D7F9 FFFFFF28      2FE      122      384       DE FFFFFEEA FFFFFFFF FF00F742        0        0
-Current  229D749      35C      1FE      3D2      274       E4 FFFFFEB2  229ED39 FF010002        0        0
-Current  229D699      3DA FFFFFF74      450       80       F4 FFFFFE6A  229E039 FF010002        0        0
-Current  229E039      2DE        4      358       7A       E6 FFFFFEB2  229EC89 FF010002        0        0
-Current  229DF89      406 FFFFFF78      480 FFFFFFEE       B8 FFFFFE86  229CB69 FF01F742        0        0
-Current  229EE99      2E6       28      35C       9E       F0 FFFFFE74 FFFFFFFF FF000002        0        0
-Current  229EDE9      2DE        4      4D2       7A       CC FFFFFEB4  229CAB9 FF010002        0        0
-Current  229ED39      400        2      682       E6       E6 FFFFFEB2  229D699 FF010002        0        0
-Current  229EC89      2E6      17A      40E      1F0       F6 FFFFFF0A  229EBD9 FF010002        0        0
-Current  229EBD9       6A FFFFFFD6      21C      156       96 FFFFFE92  229E869 FF01F742        0        0
-Current  229EB29      306      274      4CE      2EA       92 FFFFFE92  229EA79 FF01F742        0        0
-Current  229EA79      240 FFFFFFE2      2B6       58       CE FFFFFE9A  229E9C9 FF010002        0        0
-Current  229E9C9      276       76      312      1EA       E0 FFFFFEB6  229E919 FF010002        0        0
-Current  229E919        8      2CE      10A      344       E8 FFFFFEAC  229E7B9 FF030002        0        0
-Current  229E869      2DE        4      354       7A       B8 FFFFFEB2  229EB29 FF010002        0        0
-Current  229E7B9       EC       94      200      24E       E4 FFFFFEB4  229E709 FF030002        0        0
-Current  229E709      248       9C      3F8      24A       88 FFFFFE8A FFFFFFFF FF03F742        0        0
-Old      229DF89      406 FFFFFFC0      480 FFFFFFEE       B8 FFFFFE86  229EDE9 8F03F742 FFFFFFFF  1410000
-Open     229DF89      407 FFFFFFC0      47C FFFFFFF4       B7 FFFFFE84 FFFFFFFF 8F03F742  2297C09  1410000
--- a/Test/Nest2/LogO
+++ b/Test/Nest2/LogO
-Current  21BD199      17E     16AC      25C     1700       9A FFFFFE7A  21BCE39 E483F752 FFFFFFFF   A10000
-Current  21BA609      4E8     2B04      720     2D90       96 FFFFFF46 FFFFFFFF B803F752  21BA069   940000
-Current  21BA3C9      13C       A4      360      22E       E6 FFFFFEB2 FFFFFFFF FF030002 FFFFFFFF        0
-Current  21BA4E9      346      134      47E      23A       D2 FFFFFECC  21BA069 95030002  21B8E29  4560000
-Current  21BA189 FFFFFE3A FFFFEAA2 FFFFFE8E FFFFEAFA       D8 FFFFFEAC  21BCF59 B4830002  21BCE39  5220000
-Current  21BCBF9      108      1C4      17C      21A       8A FFFFFE90 FFFFFFFF 9003F752  21BD079  5440000
-Current  21B9A09      18C      22E      232      254       86 FFFFFEAA FFFFFFFF D8830002  21BA3C9  4020000
-Current  21B9D69      49A     28E0      508     29DC       9C FFFFFE90 FFFFFFFF 8000F752 FFFFFFFF  A180000
-Current  21BA069      62A     1620      6EA     17B0       80 FFFFFF42 FFFFFFFF DC83F752  21B8E29  8600000
-Current  21B9B29      18C      2EA      232      310       FE FFFFFE98 FFFFFFFF 97830002  21BA729  9AA0000
-Current  21BA2A9      13E      11E      376      258       92 FFFFFE92 FFFFFFFF F087F752  21BCBF9  9200000
-Current  21B9C49      54E     1660      598     176A       98 FFFFFE00 FFFFFFFF 8603F752  21BA4E9  6A40000
-Current  21B98E9      828     28DE      A42     2AAE       88 FFFFFE28 FFFFFFFF B487F752  21BD3D9  4000000
-Current  21B8E29       8E       D0      2F8      138       BE FFFFFDFA FFFFFFFF 80030002  21B9B29  5080000
-Current  21BCD19       B8       2A      14E      1DE       F2 FFFFFEAE FFFFFFFF F0000002 FFFFFFFF  1280000
-Current  21BD2B9 FFFFFF2E     134A       BA     1516       8A FFFFFEB6  21BA3C9 F083F752 FFFFFFFF  1680000
-Current  21BCE39 FFFFFC80 FFFFE9CE FFFFFE8E FFFFEAFE       B0 FFFFFE74  21B94E9 9503F752 FFFFFFFF  1910000
-Current  21BD079       14 FFFFFF1E      1A8       78       9A FFFFFEB4  21B9069 D003F752  21B9C49   480000
-Current  21B94E9       A4       FC      21E      290       A0 FFFFFE98  21BA729 8E01F752 FFFFFFFF  A920000
-Current  21BCF59      20C      262      3FE      390       90 FFFFFE90 FFFFFFFF 9783F752  21BCE39  4810000
-Current  21B9189      988     3C1A      B96     3C26       8A FFFFFE7E FFFFFFFF 8403F752  21BA609  5910000
-Current  21BD3D9      62A     1620      6D0     1646       E4 FFFFFEC6  21BA609 DC830002  21BA069  4A00000
-Current  21B9609       D4      202      338      312       92 FFFFFE92  21BD199 FF01F752 FFFFFFFF        0
-Current  21B9069 FFFFFD06 FFFFEB7C FFFFFE18 FFFFEC3C       82 FFFFFE7E FFFFFFFF D003F752  21B9C49  9520000
-Current  21BA729      18C      2E8      232      336       7E FFFFFE80  21BD2B9 9803F752 FFFFFFFF  A500000
-Old      21BD3D9      18C      310      232      336       E8 FFFFFEB8  21B9A09 F8850002  21B9B29        0
-Open     21BD3D9      18C      310      232      336       E5 FFFFFEC7  21BA609 DC850002  21BA069  4A00001
-Old      21B9A09      18C      310      232      336       86 FFFFFEAA  21B8E29 D8870002  21B9B29    20000
-Open     21B9A09      18C      310      232      336       86 FFFFFEAA FFFFFFFF D8870002  21BA3C9  4020000
--- a/Test/Nest2/Sprite1,ff9
+++ b/Test/Nest2/Sprite1,ff9
--- a/Test/Nest2/Sprite2,ff9
+++ b/Test/Nest2/Sprite2,ff9
--- a/Test/Nest2/Templates,fec
+++ b/Test/Nest2/Templates,fec
--- a/Test/Nest2/Tree
+++ b/Test/Nest2/Tree
-FFFFFFFF
-  21BBF59
-    21BC2B9
-  21BC199
-    21BB9B9
-      21BB539
-      21B8BE9
-        21BC3D9
-          21BB1D9
-          21B9379
-            21BC4F9
-              21BB0B9
-                21B8AC9
-              21BB419
-          21BB659
-            21BBBF9
-              21BBD19
-      21BAF99
-        21BC079
-          21BBE39
-    21B8D09
-      21B9499
-        21BB899
-  21BBAD9
--- a/Test/Nest2/Tree_A
+++ b/Test/Nest2/Tree_A
-FFFFFFFF
-  228BDE9
-    228ABC9
-  2290E59
-    228B4F9
-      228C389
-      22D2459
-        228BF09
-          228AF29
-          2290D39
-            228B2B9
-              2285539
-                22D33E9
-              2290AF9
-          228C029
-            2290C19
-              22D2699
-      22909D9
-        228AAA9
-          228C149
-    22D4549
-      228B3D9
-        22D27B9
-  22D2579