update tests to remove use of [Rq] flag

[fleet.git] / tests / requeue / test-requeue.fleet

diff --git a/tests/requeue/test-requeue.fleet b/tests/requeue/test-requeue.fleet
index ec0e15f..2f0e1d8 100644 (file)
--- a/tests/requeue/test-requeue.fleet
+++ b/tests/requeue/test-requeue.fleet
@@ -1,11 +1,11 @@
 #expect 6
 #expect 6
 #expect 6
+#expect 6
+#expect 10
 #expect 10
 #expect 10
 #expect 10
-#expect 14
-#expect 14
 #expect 14
 #expect 14
 #expect 14
@@ -14,16 +14,10 @@
 #expect 18
 #expect 18
 #expect 18
-#expect 18
-#expect 18
-#expect 22
 #expect 22
 #expect 22
 #expect 22
 #expect 22
-#expect 22
-#expect 26
-#expect 26
 #expect 26
 #expect 26
 #expect 26
@@ -32,44 +26,44 @@
 #expect 30
 #expect 30
 #expect 30
-#expect 30
-#expect 30
-#expect 34
-#expect 34
-#expect 34
-#expect 34
-#expect 34
-#expect 34
-#expect 34
-#expect 34
-#expect 34
-#expect 34
 #expect 34
 #expect 34
 #expect 34
 #expect 34
+#expect 38
+#expect 38
+#expect 38
+#expect 38
+#expect 42
+#expect 42
+#expect 42
+#expect 42
+#expect 46
 
-#ship alu   : Alu2
+#ship alu   : Alu
 #ship debug : Debug
-#ship f     : Fifo
 
-f.in: literal 2; deliver; literal 4; deliver;
-f.out: take, sendto alu.in1;
-       take, sendto alu.in2;
+alu.inOp:  set word=Alu.inOp[ADD];
+           set ilc=*;  deliver;
+
+debug.in:  set ilc=41;  recv, deliver, send token to alu.out;
+
+alu.in2:   set word= 4;
+           set ilc=*;  deliver;
+
+alu.out:   set olc=40;
+           head;
+           collect, send to alu.in1;
+           send to debug.in;
+           recv token;
+           tail;
 
-alu.in1:   clog;
-           take, deliver, requeue forever;
-           deliver,       requeue forever;
-           discard,       requeue forever;
-           deliver,       requeue 4 times ;
-           unclog;
-alu.in2:   take;
-           [*] deliver;
-alu.inOp:  literal Alu2.inOp[ADD];
-           [*] deliver;
-alu.out:   clog;
-           take, sendto alu.in1, requeue 40 times;
-           sendto debug.in, requeue 50 times;
-           unclog;
-debug.in:  [*] take, deliver;
+alu.in1:   set word= 2;
+           set ilc=4;
+           deliver;
+           set olc=2;
+           head;
+           recv, deliver;
+           recv nothing, deliver;
+           tail;