reshuffle tests a bit, add recycle-expire

diff --git a/tests/alu1/simple-alu1-test.fleet b/tests/alu1/simple-alu1-test.fleet
deleted file mode 100644 (file)
index 8b95bd2..0000000
--- a/tests/alu1/simple-alu1-test.fleet
+++ /dev/null
@@ -1,30 +0,0 @@
-// expected output
-#expect 10
-#expect 8
-#expect 9
-#expect -9
-#expect 9
-
-#ship debug        : Debug
-#ship alu1         : Alu1
-
-debug.in:   [*] take, deliver;
-9:          sendto alu1.in;
-9:          sendto alu1.in;
-9:          sendto alu1.in;
-9:          sendto alu1.in;
-
-1:          sendto alu1.inOp;
-2:          sendto alu1.inOp;
-3:          sendto alu1.inOp;
-0:          sendto alu1.inOp;
-0:          sendto alu1.inOp;
-
-alu1.in:    [*] take, deliver;
-alu1.inOp:  [*] take, deliver;
-alu1.out:
-  [3] take, sendto debug.in;
-  take;
-  sendto debug.in;
-  sendto alu1.in;
-  [*] take, sendto debug.in;

diff --git a/tests/alu2/simple-alu2-test.fleet b/tests/alu2/simple-alu2-test.fleet
deleted file mode 100644 (file)
index 9ca5d4d..0000000
--- a/tests/alu2/simple-alu2-test.fleet
+++ /dev/null
@@ -1,28 +0,0 @@
-// expected output
-#ship debug : Debug
-#ship alu   : Alu2
-
-#expect 17
-#expect 1
-#expect 8
-#expect 9
-
-debug.in:   [*] take, deliver;
-9:          sendto alu.in1;
-9:          sendto alu.in1;
-9:          sendto alu.in1;
-9:          sendto alu.in1;
-8:          sendto alu.in2;
-8:          sendto alu.in2;
-8:          sendto alu.in2;
-8:          sendto alu.in2;
-
-Alu2.ADD:   sendto alu.inOp;
-Alu2.SUB:   sendto alu.inOp;
-Alu2.MIN:   sendto alu.inOp;
-Alu2.MAX:   sendto alu.inOp;
-
-alu.in1:    [*] take, deliver;
-alu.in2:    [*] take, deliver;
-alu.inOp:   [*] take, deliver;
-alu.out:    [*] take, sendto debug.in;

diff --git a/tests/benkobox/count/test-count.fleet b/tests/benkobox/test-count.fleet
similarity index 100%
rename from tests/benkobox/count/test-count.fleet
rename to tests/benkobox/test-count.fleet

diff --git a/tests/recycle/test-recycle-expire.fleet b/tests/recycle/test-recycle-expire.fleet
new file mode 100644 (file)
index 0000000..cfb13f5
--- /dev/null
+++ b/tests/recycle/test-recycle-expire.fleet
@@ -0,0 +1,17 @@
+#expect 9
+#expect 8
+#expect 8
+#ship debug        : Debug
+#ship fifo         : Fifo
+
+9: sendto debug.in;
+8: sendto debug.in;
+7: sendto debug.in;
+debug.in: 
+  [*] nop;
+  (2) take;
+  (3) deliver;
+  kill*;
+
+
+

diff --git a/tests/recycle/test-recycle.fleet b/tests/recycle/test-recycle.fleet
index d7d73de..3d83990 100644 (file)
--- a/tests/recycle/test-recycle.fleet
+++ b/tests/recycle/test-recycle.fleet
@@ -60,13 +60,14 @@ alu.in1:   [*] nop;
            (*) deliver;
            (*) dismiss;
            (4) deliver;
-           kill;
+           kill*;
 alu.in2:   take;
            [*] deliver;
 alu.inOp:  take;
-           (*) deliver;
+           [*] deliver;
 alu.out:   [*] nop;
            (40) take, sendto alu.in1;
            (50) sendto debug.in;
-           kill;
+           kill*;
 debug.in:  [*] take, deliver;
+