From d75eae68dd6c782863471af5cac9b7336614e902 Mon Sep 17 00:00:00 2001
From: megacz <adam@megacz.com>
Date: Sat, 14 Mar 2009 15:16:41 -0700
Subject: [PATCH] update tests to remove use of [Rq] flag

---
 tests/dock/predicate-olc-equals-zero.fleet               |    8 ++++----
 tests/dock/test-use-loop-counter.fleet                   |   10 +++++-----
 tests/requeue/requeueing-literal.fleet                   |    8 ++++----
 tests/requeue/test-for-common-requeue-timing-error.fleet |   14 +++++++-------
 tests/requeue/test-requeue.fleet                         |   10 +++++-----
 tests/torpedo/epilogue-fifo.test                         |    2 +-
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/tests/dock/predicate-olc-equals-zero.fleet b/tests/dock/predicate-olc-equals-zero.fleet
index 759ad67..2d91740 100644
--- a/tests/dock/predicate-olc-equals-zero.fleet
+++ b/tests/dock/predicate-olc-equals-zero.fleet
@@ -10,10 +10,10 @@ debug.in:
   set flags a=0, b=0;
   set olc=3;
   head;
-  [Rq] [d] set word=4;
-  [Rq] [d] deliver;
-  [Rq] deliver;
-  [Rq] set olc--;
+  [d] set word=4;
+  [d] deliver;
+  deliver;
+  set olc--;
   [d] abort;
   tail;
 
diff --git a/tests/dock/test-use-loop-counter.fleet b/tests/dock/test-use-loop-counter.fleet
index 24b8239..7a07847 100644
--- a/tests/dock/test-use-loop-counter.fleet
+++ b/tests/dock/test-use-loop-counter.fleet
@@ -21,11 +21,11 @@ fifo.out:
 fifo.in:
   set olc=3;
   head;
-  [Rq] set word=5;
-  [Rq] deliver;
-  [Rq] send token to memory.inCBD;
-  [Rq] recv, deliver;
-  [Rq] set olc--;
+  set word=5;
+  deliver;
+  send token to memory.inCBD;
+  recv, deliver;
+  set olc--;
   [d] abort;
   [d] send token to memory.out;
   tail;
diff --git a/tests/requeue/requeueing-literal.fleet b/tests/requeue/requeueing-literal.fleet
index 75fd4cc..a6eed71 100644
--- a/tests/requeue/requeueing-literal.fleet
+++ b/tests/requeue/requeueing-literal.fleet
@@ -19,10 +19,10 @@ debug.in:
 fifo.out:
   set olc=3;
   head;
-  [Rq] set word= 5;
-  [Rq] send to debug.in;
-  [Rq] collect;
-  [Rq] send to debug.in;
+  set word= 5;
+  send to debug.in;
+  collect;
+  send to debug.in;
   [d] abort;
   tail;
 
diff --git a/tests/requeue/test-for-common-requeue-timing-error.fleet b/tests/requeue/test-for-common-requeue-timing-error.fleet
index 64891eb..4a9e007 100644
--- a/tests/requeue/test-for-common-requeue-timing-error.fleet
+++ b/tests/requeue/test-for-common-requeue-timing-error.fleet
@@ -13,7 +13,7 @@
 
 
 fifo0.out: set olc=1;
-fifo0.out: [Rq] collect;
+fifo0.out: collect;
 
 debug0.in: set ilc=*;
 debug0.in: recv, deliver, send token to alu21.out;
@@ -30,8 +30,8 @@ alu21.in1: set ilc=*;
 alu21.in1: recv, deliver, send token to fifo0.out;
 
 fifo0.out: head;
-fifo0.out: [Rq] send to alu21.in1;
-fifo0.out: [Rq] recv token;
+fifo0.out: send to alu21.in1;
+fifo0.out: recv token;
 
 alu21.in2: set word= 2;
 alu21.in2: set ilc=*;
@@ -42,8 +42,8 @@ fifo0.out: tail;
 alu21.out: send token to alu21.out;
 alu21.out: set olc=1;
 alu21.out: head;
-alu21.out: [Rq] collect;
-//alu21.out: [Rq] set flags a=a, b=b;   // uncommenting this line will mask the bug
-alu21.out: [Rq] send to debug0.in;
-alu21.out: [Rq] recv token;
+alu21.out: collect;
+//alu21.out: set flags a=a, b=b;   // uncommenting this line will mask the bug
+alu21.out: send to debug0.in;
+alu21.out: recv token;
 alu21.out: tail;
diff --git a/tests/requeue/test-requeue.fleet b/tests/requeue/test-requeue.fleet
index 5d0c12a..2f0e1d8 100644
--- a/tests/requeue/test-requeue.fleet
+++ b/tests/requeue/test-requeue.fleet
@@ -53,9 +53,9 @@ alu.in2:   set word= 4;
 
 alu.out:   set olc=40;
            head;
-           [Rq] collect, send to alu.in1;
-           [Rq] send to debug.in;
-           [Rq] recv token;
+           collect, send to alu.in1;
+           send to debug.in;
+           recv token;
            tail;
 
 alu.in1:   set word= 2;
@@ -63,7 +63,7 @@ alu.in1:   set word= 2;
            deliver;
            set olc=2;
            head;
-           [Rq] recv, deliver;
-           [Rq] recv nothing, deliver;
+           recv, deliver;
+           recv nothing, deliver;
            tail;
 
diff --git a/tests/torpedo/epilogue-fifo.test b/tests/torpedo/epilogue-fifo.test
index e49ae4c..e858d00 100644
--- a/tests/torpedo/epilogue-fifo.test
+++ b/tests/torpedo/epilogue-fifo.test
@@ -6,7 +6,7 @@
 debug.in:
   set word= 0;
   head;
-  [Rq] nop;
+  nop;
   deliver;
   set olc=0;
   [d] abort;
-- 
1.7.10.4