From 88d7a366e7e12b52d91b1280ff57239ead3bc767 Mon Sep 17 00:00:00 2001 From: Joshua Wise Date: Sat, 17 Jan 2009 06:15:01 -0500 Subject: [PATCH] tests/testbench: Update output formatting for testbench. --- tests/ack.c | 5 +- tests/j4cbo.c | 10 ++-- tests/testbench.hex | 139 ++++++++++++++++++++------------------------ 3 files changed, 71 insertions(+), 83 deletions(-) diff --git a/tests/ack.c b/tests/ack.c index ab57018..b72732c 100644 --- a/tests/ack.c +++ b/tests/ack.c @@ -17,9 +17,10 @@ void acktest() { int x; if ((x = ack(3, 3)) != 61) { - puts("FAIL: Ack test did not return 61\n"); + puthex(x); + puts(" -> FAIL\n"); puthex(x); } else - puts("PASS: Ack test returned 61\n"); + puts("PASS\n"); } diff --git a/tests/j4cbo.c b/tests/j4cbo.c index 3a1382e..b7407d2 100644 --- a/tests/j4cbo.c +++ b/tests/j4cbo.c @@ -165,8 +165,10 @@ int h1100(bitpos) void j4cbo() { - if (h(0) != 151) - puts("Result was not 151\r\n"); - else - puts("Result was 151\r\n"); + int x; + if ((x = h(0)) != 151) { + puthex(x); + puts(" -> FAIL\n"); + } else + puts("PASS\n"); } diff --git a/tests/testbench.hex b/tests/testbench.hex index ceab6f8..f3c75de 100644 --- a/tests/testbench.hex +++ b/tests/testbench.hex @@ -1,5 +1,5 @@ e59fd00c -eb00038c +eb000395 eafffffe ee000510 e1a0f00e @@ -52,7 +52,7 @@ e3530000 aaffffee e24bd00c e89da800 -00000ee8 +00000f0c e1a0c00d e92dd810 e24cb004 @@ -105,20 +105,23 @@ e1a03000 e50b3010 e51b3010 e353003d -0a000006 +0a000009 +e51b3010 +e1a00003 +ebffffa9 e59f3024 e1a00003 -ebffff96 +ebffff93 e51b3010 e1a00003 -ebffffa6 +ebffffa3 ea000002 e59f300c e1a00003 -ebffff8f +ebffff8c e89da808 -00000efc 00000f20 +00000f2c e1a0c00d e92dd800 e24cb004 @@ -234,16 +237,16 @@ e50b3014 ea000006 e59f3024 e1a00003 -ebffff18 +ebffff15 e51b3010 e1a00003 -ebffff28 +ebffff25 eafffffe e51b3014 e1a00003 e24bd00c e89da800 -00000f3c +00000f34 e1a0c00d e92dd800 e24cb004 @@ -721,21 +724,27 @@ e89da800 e1a0c00d e92dd800 e24cb004 +e24dd004 e3a00000 -ebfffe3b +ebfffe3a e1a03000 +e50b3010 +e51b3010 e3530097 -0a000003 +0a000006 +e51b3010 +e1a00003 +ebfffd37 e59f3018 e1a00003 -ebfffd2a +ebfffd21 ea000002 e59f300c e1a00003 -ebfffd26 -e89da800 -00000f60 -00000f78 +ebfffd1d +e89da808 +00000f20 +00000f2c e1a0c00d e92dd810 e24cb004 @@ -810,14 +819,14 @@ e1520003 1a000003 e59f3018 e1a00003 -ebfffcd8 +ebfffccf ea000002 e59f300c e1a00003 -ebfffcd4 +ebfffccb e89da818 -00000f8c -00000f94 +00000f2c +00000f58 e1a0c00d e92dd800 e24cb004 @@ -853,14 +862,14 @@ e1520003 0a000003 e59f3018 e1a00003 -ebfffcad +ebfffca4 ea000002 e59f300c e1a00003 -ebfffca9 +ebfffca0 e89da800 -00000f94 -00000f8c +00000f58 +00000f2c e1a0300e eb000009 e1a00000 @@ -894,41 +903,41 @@ e3530722 0a000009 e59f3030 e1a00003 -ebfffc84 +ebfffc7b e51b3010 e1a00003 -ebfffc94 +ebfffc8b e59f301c e1a00003 -ebfffc7e +ebfffc75 ea000002 e59f3010 e1a00003 -ebfffc7a +ebfffc71 e89da808 -00000f9c -00000fb0 -00000f8c +00000f60 +00000f74 +00000f2c e1a0c00d e92dd800 e24cb004 e24dd004 e59f307c e1a00003 -ebfffc6f +ebfffc66 e59f3074 e50b3010 ea000010 e59f306c e1a00003 -ebfffc69 +ebfffc60 e51b3010 e5933000 e1a00003 -ebfffc65 +ebfffc5c e59f3054 e1a00003 -ebfffc62 +ebfffc59 e51b3010 e5933004 e1a0e00f @@ -942,37 +951,26 @@ e3530000 1affffea e59f3020 e1a00003 -ebfffc54 +ebfffc4b e3a03000 e1a00003 e89da808 -00000fe0 -0000100c -00000ff4 -00001000 -00001004 +00000fa4 +00000fd0 +00000fb8 +00000fc4 +00000fc8 00002fe0 33323130 37363534 42413938 46454443 00000000 +203e2d20 4c494146 -6341203a -6574206b -64207473 -6e206469 -7220746f -72757465 -3136206e 0000000a 53534150 -6341203a -6574206b -72207473 -72757465 -2064656e -000a3136 +0000000a 4c494146 62615b20 5d74726f @@ -982,19 +980,6 @@ e89da808 79622072 23206574 00000000 -75736552 -7720746c -6e207361 -3120746f -0a0d3135 -00000000 -75736552 -7720746c -31207361 -0a0d3135 -00000000 -53534150 -0000000a 4c494146 0000000a 4c494146 @@ -1025,15 +1010,15 @@ e89da808 0000203a 656e6f44 00000a21 -00000fb4 -00000dd0 -00000fc0 -00000d2c -00000fc8 -00000b40 -00000fd0 +00000f78 +00000df4 +00000f84 +00000d50 +00000f8c +00000b4c +00000f94 00000180 -00000fd4 -00000c60 +00000f98 +00000c84 00000000 00000000 -- 2.39.2