3 files changed, 103 insertions, 93 deletions
diff --git a/tests/runtests.pd b/tests/runtests.pd
index 5e7abc2..495180b 100644
--- a/tests/runtests.pd
+++ b/tests/runtests.pd
@@ -1,21 +1,27 @@
-#N canvas 211 200 452 500 10;
-#X obj 177 433 testunit;
-#X obj 177 377 textfile;
+#N canvas 687 66 452 500 10;
+#X obj 177 483 testunit;
 #X obj 177 183 t b b;
 #X msg 207 261 read runtests.txt \, rewind;
 #X obj 177 126 bng 40 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
 -1;
 #X msg 177 351 bang;
-#X symbolatom 195 408 10 0 0 0 - - -;
+#X symbolatom 195 458 10 0 0 0 - - -;
 #X obj 102 314 t b;
 #X obj 102 342 del 10;
-#X connect 0 0 7 0;
-#X connect 1 0 0 0;
-#X connect 2 0 5 0;
-#X connect 2 1 3 0;
+#X obj 177 377 textfile;
+#X obj 177 396 symbol;
+#X obj 177 421 t s s;
+#X symbolatom 213 422 0 0 0 0 - - -;
+#X connect 0 0 6 0;
+#X connect 1 0 4 0;
+#X connect 1 1 2 0;
+#X connect 2 0 8 0;
 #X connect 3 0 1 0;
-#X connect 4 0 2 0;
-#X connect 5 0 1 0;
-#X connect 6 0 0 0;
+#X connect 4 0 8 0;
+#X connect 5 0 0 0;
+#X connect 6 0 7 0;
 #X connect 7 0 8 0;
-#X connect 8 0 1 0;
+#X connect 8 0 9 0;
+#X connect 9 0 10 0;
+#X connect 10 0 0 0;
+#X connect 10 1 11 0;
diff --git a/tests/runtests.txt b/tests/runtests.txt
index d67531d..8fcc351 100644
--- a/tests/runtests.txt
+++ b/tests/runtests.txt
@@ -66,10 +66,11 @@ help-msg/time;
 help-msg/unpack~;
 help-msg/urn;
 help-msg/wrap;
-help-msg/zexy;
+help-msg/zexy_;
 help-msg/z~;
 l2s/argument;
 l2s/delimiter;
+msgfile/emptyreplace;
 msgfile/reentrant;
 repeat/noargs;
 s2l/numsymbols;
diff --git a/tests/testunit.pd b/tests/testunit.pd
index 1662d43..a9f35bb 100644
--- a/tests/testunit.pd
+++ b/tests/testunit.pd
@@ -1,19 +1,10 @@
-#N canvas 302 200 312 252 10;
-#N canvas 47 151 894 418 run-test 0;
-#X obj 71 76 symbol;
-#X obj 71 44 inlet test-to-run;
-#X obj 506 344 outlet result;
-#X obj 506 320 pack 0 s;
-#X obj 150 155 makefilename pd-%d-regressiontest;
-#X obj 89 195 pack s \$0 s;
-#X obj 150 136 f \$0;
-#X obj 89 130 t s b;
-#X obj 506 140 t b s s;
-#X msg 113 76 bang;
-#X obj 71 314 s \$0-send;
-#X msg 89 215 \; \$3 clear \; \$3 obj 100 100 r \$2-send \; \$3 obj
-100 150 \$1 \; \$3 obj 100 200 s \$2-receive \; \$3 connect 0 0 1 0
-\; \$3 connect 1 0 2 0;
+#N canvas 850 122 312 252 10;
+#N canvas 455 165 474 559 run-test 0;
+#X obj 71 136 symbol;
+#X obj 71 104 inlet test-to-run;
+#X obj 71 514 outlet result;
+#X obj 71 440 pack 0 s;
+#X msg 113 136 bang;
 #N canvas 395 348 450 300 print 0;
 #X obj 101 247 print regression-test;
 #X obj 101 204 pack s s;
@@ -23,8 +14,8 @@
 #X msg 101 138 OK;
 #X obj 101 185 symbol;
 #X msg 101 223 \$2: \$1;
-#X obj 296 82 inlet test;
-#X obj 101 92 inlet result;
+#X obj 101 52 inlet result;
+#X obj 101 89 unpack 0 s;
 #X connect 1 0 7 0;
 #X connect 2 0 5 0;
 #X connect 2 1 3 0;
@@ -33,85 +24,97 @@
 #X connect 5 0 6 0;
 #X connect 6 0 1 0;
 #X connect 7 0 0 0;
-#X connect 8 0 1 1;
+#X connect 8 0 9 0;
 #X connect 9 0 2 0;
-#X restore 531 291 pd print result;
-#X obj 506 270 t f f;
-#X msg 531 235 \; \$1 clear;
-#X obj 531 215 symbol;
-#X obj 506 182 t f b;
-#X obj 71 104 t b s s;
-#X text 63 387 start regression test;
-#X text 501 391 regression test finished;
-#N canvas 0 0 450 475 get 0;
-#X obj 106 36 r \$0-receive;
-#X msg 137 280 0;
-#X obj 106 159 del 0;
+#X connect 9 1 1 1;
+#X restore 96 491 pd print result;
+#X obj 71 252 t f b;
+#X obj 71 164 t b s s;
+#X text 99 217 start regression test;
+#X text 105 251 regression test finished;
+#N canvas 649 180 525 641 get 0;
+#X obj 106 116 r \$0-receive;
+#X msg 155 280 0;
+#X obj 106 239 del 0;
 #X obj 106 310 f;
-#X text 193 34 get the result;
-#X text 145 155 we need a delay \, since the object's output triggers
+#X text 193 114 get the result;
+#X text 145 235 we need a delay \, since the object's output triggers
 the destruction of the object \; this would lead to stack corruption
 if we do it immediately;
 #X obj 131 358 outlet;
-#X obj 137 236 inlet reset;
+#X obj 123 26 inlet reset;
 #X obj 106 336 t b f;
-#X obj 106 95 spigot;
-#X obj 137 258 t b b;
-#X msg 161 74 1;
-#X obj 106 117 t b f b;
-#X msg 189 74 0;
-#X obj 137 74 t f;
-#X text 182 98 we only accept the 1st result of the test;
+#X obj 106 175 spigot;
+#X msg 161 154 1;
+#X obj 106 197 t b f b;
+#X msg 189 154 0;
+#X obj 137 154 t f;
+#X text 182 178 we only accept the 1st result of the test;
+#X obj 123 48 t b b b;
+#X obj 123 66 s \$0-send;
 #X connect 0 0 9 0;
 #X connect 1 0 3 1;
 #X connect 2 0 3 0;
 #X connect 3 0 8 0;
-#X connect 7 0 10 0;
-#X connect 8 0 11 0;
+#X connect 7 0 15 0;
+#X connect 8 0 10 0;
 #X connect 8 1 6 0;
-#X connect 9 0 12 0;
-#X connect 10 0 1 0;
-#X connect 10 1 11 0;
-#X connect 11 0 14 0;
-#X connect 12 0 2 0;
-#X connect 12 1 3 1;
-#X connect 12 2 13 0;
-#X connect 13 0 14 0;
-#X connect 14 0 9 1;
-#X restore 506 162 pd get result;
-#X obj 150 175 t s s;
-#X text 401 23 the test MUST return a result!;
-#X text 414 70 cons: the regression test suite will block until the
+#X connect 9 0 11 0;
+#X connect 10 0 13 0;
+#X connect 11 0 2 0;
+#X connect 11 1 3 1;
+#X connect 11 2 12 0;
+#X connect 12 0 13 0;
+#X connect 13 0 9 1;
+#X connect 15 0 16 0;
+#X connect 15 1 1 0;
+#X connect 15 2 10 0;
+#X restore 71 232 pd get result;
+#X text 64 17 the test MUST return a result!;
+#X text 77 64 cons: the regression test suite will block until the
 test returns a result (potentially infinitely long)!;
-#X text 414 39 pros: the test need not be finished in zero-time (good
+#X text 77 33 pros: the test need not be finished in zero-time (good
 for testing signal-objects or timed objects);
-#X connect 0 0 17 0;
+#X obj 71 470 t l l;
+#X obj 71 214 t b;
+#N canvas 0 0 625 330 create/destroy 0;
+#X obj 148 53 inlet;
+#X obj 449 48 inlet clear;
+#X obj 148 129 pack s \$0;
+#X msg 173 196 clear;
+#X obj 449 76 t b;
+#X obj 148 148 t l b;
+#X msg 148 165 obj 100 100 r \$2-send \, obj 100 150 \$1 \, obj 100
+200 s \$2-receive \, connect 0 0 1 0 \, connect 1 0 2 0;
+#X obj 148 228 s pd-\$0-regressiontest;
+#X obj 148 94 t s;
+#X connect 0 0 8 0;
+#X connect 1 0 4 0;
+#X connect 2 0 5 0;
+#X connect 3 0 7 0;
+#X connect 4 0 3 0;
+#X connect 5 0 6 0;
+#X connect 5 1 3 0;
+#X connect 6 0 7 0;
+#X connect 8 0 2 0;
+#X restore 89 326 pd create/destroy testpatch;
+#X connect 0 0 7 0;
 #X connect 1 0 0 0;
-#X connect 3 0 2 0;
-#X connect 4 0 21 0;
-#X connect 5 0 11 0;
-#X connect 6 0 4 0;
-#X connect 7 0 5 0;
-#X connect 7 1 6 0;
-#X connect 8 0 20 0;
-#X connect 8 1 3 1;
-#X connect 8 2 12 1;
-#X connect 9 0 0 0;
-#X connect 13 0 3 0;
-#X connect 13 1 12 0;
-#X connect 15 0 14 0;
-#X connect 16 0 13 0;
-#X connect 16 1 15 0;
-#X connect 17 0 10 0;
-#X connect 17 1 7 0;
-#X connect 17 2 8 0;
-#X connect 20 0 16 0;
-#X connect 21 0 5 2;
-#X connect 21 1 15 1;
+#X connect 3 0 14 0;
+#X connect 4 0 0 0;
+#X connect 6 0 3 0;
+#X connect 6 1 16 1;
+#X connect 7 0 15 0;
+#X connect 7 1 16 0;
+#X connect 7 2 3 1;
+#X connect 10 0 6 0;
+#X connect 14 0 2 0;
+#X connect 14 1 5 0;
+#X connect 15 0 10 0;
 #X restore 94 138 pd run-test;
 #X obj 94 163 outlet;
 #X obj 94 111 inlet;
-#N canvas 487 407 450 300 1002-regressiontest 0;
+#N canvas 487 407 450 300 \$0-regressiontest 0;
 #X restore 92 186 pd \$0-regressiontest;
 #X connect 0 0 1 0;
 #X connect 2 0 0 0;