From 47299d154994d8caf80818e7c21873dcfb62ad18 Mon Sep 17 00:00:00 2001 From: Jonathan Wilkes <jancsika@yahoo.com> Date: Tue, 8 Aug 2017 21:15:36 -0400 Subject: [PATCH] use a better error message for not meeting quota, actually fail if object count isn't met --- scripts/external-tests.pd | 72 ++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/scripts/external-tests.pd b/scripts/external-tests.pd index 4b22fce61..b834a47a8 100644 --- a/scripts/external-tests.pd +++ b/scripts/external-tests.pd @@ -1,4 +1,4 @@ -#N canvas 5 53 659 639 12; +#N canvas 1 53 659 639 12; #X obj 61 34 loadbang; #N canvas 107 123 756 233 load_hcs/folder_list 0; #X obj 357 47 inlet; @@ -746,7 +746,7 @@ nameclash is in the current library we're testing then we ignore it. #X connect 1 0 2 0; #X connect 1 1 3 0; #X restore 164 329 pd set_\$0-ext; -#N canvas 243 98 571 514 results 0; +#N canvas 67 78 672 572 results 0; #X obj 62 25 inlet; #X obj 235 33 r \$0-current-libdir-name; #X obj 146 33 r \$0-fail; @@ -757,28 +757,27 @@ nameclash is in the current library we're testing then we ignore it. #X obj 156 214 b; #X obj 156 239 f; #X obj 196 239 + 1; -#X floatatom 196 276 5 0 0 0 failures - -, f 5; -#X obj 62 258 f; -#X msg 94 327 gui; -#X obj 94 352 pdinfo; -#X obj 62 384 list prepend; -#X msg 180 419 all tests succeeded!; -#X obj 180 444 print info; -#X obj 180 324 sel 0 1; +#X floatatom 196 316 5 0 0 0 failures - -, f 5; +#X obj 63 298 f; +#X msg 95 367 gui; +#X obj 95 392 pdinfo; +#X obj 63 424 list prepend; +#X msg 180 459 all tests succeeded!; +#X obj 180 484 print info; +#X obj 180 364 sel 0 1; #X msg 343 419 1 test failed; #X msg 356 389 \$1 tests failed; -#X obj 62 410 route 0; -#X obj 62 435 != 0; -#X obj 62 485 s pd; -#X msg 62 460 quit \$1; +#X obj 63 450 route 0; +#X obj 63 475 != 0; +#X obj 63 525 s pd; +#X msg 63 500 quit \$1; #X obj 343 444 print error; #X obj 146 112 list prepend add; #X obj 146 137 list trim; #X obj 146 162 textfile; -#X obj 79 60 t b b; -#X msg 22 123 rewind; -#X obj 22 83 until; -#X obj 62 283 t a b a b b; +#X obj 79 90 t b b; +#X msg 22 153 rewind; +#X obj 22 113 until; #X obj 335 194 bang; #X obj 335 237 f; #X obj 414 157 f; @@ -786,9 +785,11 @@ nameclash is in the current library we're testing then we ignore it. #X obj 414 125 r \$0-object-test; #X obj 402 292 print total_objects_tested; #X obj 335 262 moses 2407; -#X msg 335 320 didn't count 2407 objects; #X obj 335 345 s \$0-fail; -#X connect 0 0 11 0; +#X obj 63 212 t b b b; +#X obj 63 323 t a b a; +#X msg 335 320 only counted \$1 objects. Need 2407 to succeed; +#X connect 0 0 39 0; #X connect 1 0 4 0; #X connect 2 0 3 0; #X connect 2 0 7 0; @@ -799,7 +800,7 @@ nameclash is in the current library we're testing then we ignore it. #X connect 9 0 8 1; #X connect 9 0 10 0; #X connect 9 0 11 1; -#X connect 11 0 31 0; +#X connect 11 0 40 0; #X connect 12 0 13 0; #X connect 13 0 14 1; #X connect 14 0 20 0; @@ -820,20 +821,21 @@ nameclash is in the current library we're testing then we ignore it. #X connect 28 1 29 0; #X connect 29 0 27 0; #X connect 30 0 27 0; -#X connect 31 0 14 0; -#X connect 31 1 12 0; -#X connect 31 2 17 0; -#X connect 31 3 28 0; -#X connect 31 4 32 0; -#X connect 32 0 33 0; -#X connect 33 0 38 0; -#X connect 34 0 35 0; -#X connect 35 0 34 1; -#X connect 35 0 33 1; -#X connect 36 0 34 0; -#X connect 38 0 39 0; -#X connect 38 1 37 0; -#X connect 39 0 40 0; +#X connect 31 0 32 0; +#X connect 32 0 37 0; +#X connect 33 0 34 0; +#X connect 34 0 33 1; +#X connect 34 0 32 1; +#X connect 35 0 33 0; +#X connect 37 0 41 0; +#X connect 37 1 36 0; +#X connect 39 0 11 0; +#X connect 39 1 28 0; +#X connect 39 2 31 0; +#X connect 40 0 14 0; +#X connect 40 1 12 0; +#X connect 40 2 17 0; +#X connect 41 0 38 0; #X restore 61 601 pd results; #X obj 132 209 t a a; #X obj 61 94 trigger bang bang bang anything; -- GitLab