From: adam <adam@megacz.com>
Date: Sun, 9 Nov 2008 02:13:12 +0000 (+0100)
Subject: change some tests to require only a single fifo ship
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=bb655f930d29093559ee11e08159b319aafa9633;p=fleet.git

change some tests to require only a single fifo ship
---

diff --git a/tests/dock/test-use-loop-counter.fleet b/tests/dock/test-use-loop-counter.fleet
index fab816c..0154d63 100644
--- a/tests/dock/test-use-loop-counter.fleet
+++ b/tests/dock/test-use-loop-counter.fleet
@@ -9,7 +9,6 @@
 #ship memory       : Memory
 #ship debug        : Debug
 #ship fifo         : Fifo
-#ship fifo2        : Fifo
 
 debug.in:
    set ilc=*;
@@ -28,12 +27,11 @@ fifo.in:
   [Rq] set olc--;
   tail;
 
-fifo2.out:
+memory.out:
   set word=7;
   set ilc=3;
   send to fifo.in;
 
-memory.out:
   set ilc=*;
   collect packet, send;
 
diff --git a/tests/flags/signal-0-from-inbox-to-outbox.test.test b/tests/flags/signal-0-from-inbox-to-outbox.test.test
index 84f77b8..dc332b9 100644
--- a/tests/flags/signal-0-from-inbox-to-outbox.test.test
+++ b/tests/flags/signal-0-from-inbox-to-outbox.test.test
@@ -3,12 +3,12 @@
 
 #ship debug        : Debug
 #ship fifo         : Fifo
-#ship fifo2        : Fifo
 
 debug.in:
+  send token to fifo.out:0;
   set ilc=*;  recv, deliver;
 
-fifo2.out:
+fifo.out:
   set word= 2;
   set ilc=1;
   recv token;
@@ -17,5 +17,4 @@ fifo2.out:
   [!a] set word= 0;
   send to debug.in;
 
-fifo.in:
-  send token to fifo2.out:0;
+
diff --git a/tests/flags/signal-0-from-outbox-to-outbox.test.test b/tests/flags/signal-0-from-outbox-to-outbox.test.test
index e97049e..383e9dc 100644
--- a/tests/flags/signal-0-from-outbox-to-outbox.test.test
+++ b/tests/flags/signal-0-from-outbox-to-outbox.test.test
@@ -3,12 +3,12 @@
 
 #ship debug        : Debug
 #ship fifo         : Fifo
-#ship fifo2        : Fifo
 
 debug.in:
+  send token to fifo.out:0;
   set ilc=*;  recv, deliver;
 
-fifo2.out:
+fifo.out:
   set word= 2;
   set ilc=1;
   recv token;
@@ -17,5 +17,5 @@ fifo2.out:
   [!a] set word= 0;
   send to debug.in;
 
-fifo.out:
-  send token to fifo2.out:0;
+
+
diff --git a/tests/flags/signal-1-from-inbox-to-outbox.test.test b/tests/flags/signal-1-from-inbox-to-outbox.test.test
index 9e15062..43a0d00 100644
--- a/tests/flags/signal-1-from-inbox-to-outbox.test.test
+++ b/tests/flags/signal-1-from-inbox-to-outbox.test.test
@@ -3,12 +3,12 @@
 
 #ship debug        : Debug
 #ship fifo         : Fifo
-#ship fifo2        : Fifo
 
 debug.in:
+  send token to fifo.out:1;
   set ilc=*;  recv, deliver;
 
-fifo2.out:
+fifo.out:
   set word= 2;
   set ilc=1;
   recv token;
@@ -17,5 +17,4 @@ fifo2.out:
   [!a] set word= 0;
   send to debug.in;
 
-fifo.in:
-  send token to fifo2.out:1;
+
diff --git a/tests/flags/signal-1-from-outbox-to-outbox.test.test b/tests/flags/signal-1-from-outbox-to-outbox.test.test
index da7d1b9..69ac0e9 100644
--- a/tests/flags/signal-1-from-outbox-to-outbox.test.test
+++ b/tests/flags/signal-1-from-outbox-to-outbox.test.test
@@ -3,12 +3,12 @@
 
 #ship debug        : Debug
 #ship fifo         : Fifo
-#ship fifo2        : Fifo
 
 debug.in:
+  send token to fifo.out:1;
   set ilc=*;  recv, deliver;
 
-fifo2.out:
+fifo.out:
   set word= 2;
   set ilc=1;
   recv token;
@@ -17,5 +17,3 @@ fifo2.out:
   [!a] set word= 0;
   send to debug.in;
 
-fifo.out:
-  send token to fifo2.out:1;