From: adam <adam@megacz.com>
Date: Sun, 7 Sep 2008 03:10:46 +0000 (+0100)
Subject: re-enable torpedo tests
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=38edd9286e64aa9c3afba4a49d4275835e5f896a;p=fleet.git

re-enable torpedo tests
---

diff --git a/tests/torpedo/basic-torpedo.test b/tests/torpedo/basic-torpedo-inbox.test
similarity index 97%
rename from tests/torpedo/basic-torpedo.test
rename to tests/torpedo/basic-torpedo-inbox.test
index 6181121..007be78 100644
--- a/tests/torpedo/basic-torpedo.test
+++ b/tests/torpedo/basic-torpedo-inbox.test
@@ -1,4 +1,3 @@
-#skip
 #expect 20
 #ship debug : Debug
 #ship fifo  : Fifo
diff --git a/tests/torpedo/basic-torpedo-outbox.test b/tests/torpedo/basic-torpedo-outbox.test
new file mode 100644
index 0000000..73907a2
--- /dev/null
+++ b/tests/torpedo/basic-torpedo-outbox.test
@@ -0,0 +1,21 @@
+#expect 20
+#ship debug : Debug
+#ship fifo  : Fifo
+
+debug.in:
+  set ilc=*;
+  recv, deliver;
+
+fifo.out:
+  [Rq] nop;
+  send token to fifo.in;
+  set ilc=*;
+  [T] recv token;
+  [*] set word=20;
+  [*] send to debug.in;
+  tail;
+
+fifo.in:
+  recv token;
+  send token to fifo.out:i;
+
diff --git a/tests/torpedo/infinite-nop-is-torpedoable.fleet b/tests/torpedo/infinite-nop-is-torpedoable.fleet
index 3717e4e..6491543 100644
--- a/tests/torpedo/infinite-nop-is-torpedoable.fleet
+++ b/tests/torpedo/infinite-nop-is-torpedoable.fleet
@@ -1,13 +1,12 @@
-#skip
-#expect 20
+#expect 5
 #ship debug : Debug
 #ship fifo  : Fifo
 
 debug.in:
   set ilc=*;
   [T] nop;
-  literal 5;
-  deliver;
+  [*] set word=5;
+  [*] deliver;
 
 fifo.out:
   send token to debug.in:i;