Commit Diff

Commit:
a7c24adfe1ef9827b23c061f93786de05743e45a
From:
Sven M. Hallberg <pesco@khjk.org>
Date:
Message:
report failed test suites by name on stderr Just like we would report a failed test.
Actions:
Patch | Tree
commit - bcbeda04ca5558cceaa58058ce4b4c4b3660c708
commit + a7c24adfe1ef9827b23c061f93786de05743e45a
blob - a1f4b1c0cbcb37cca869106d9198736e47d3467c
blob + fe2f1f2c9309273ef34af1edce78a5f894147519
--- exercise
+++ exercise
@@ -67,9 +67,6 @@ proc execute_test {countervar path} {
                 if {$status == 127} {
                     # The test says it couldn't execute.
                     set what error
-                } elseif {$suite} {
-                    # This is a test suite with failures, which is ok for us.
-                    set what ok
                 } else {
                     # This is a regular failed test.
                     set what fail
@@ -119,7 +116,7 @@ proc execute_test {countervar path} {
     }
 
     # Update the counters.
-    if {$suite && $what eq "ok"} {
+    if {$suite && $what ne "error"} {
         set counters [add_suite_counters $counters $scounters]
     } else {
         dict incr counters $what
blob - b324c36aec5da0bf2ed708442d7aa9d999fcc7d7
blob + b2e707ce8b71c9bcf7a3c2d24541c05c52f0b316
--- tests/exercise/testsuite/progress.t
+++ tests/exercise/testsuite/progress.t
@@ -6,7 +6,7 @@
 export tst=$0.tests
 exec ./assert-exercise $0 \
         'run 6  ok 1  fail 2  error 3\n' \
-        '' <<EOF
+        "fail $tst\n\n" <<EOF
 #!/bin/sh
     printf 'run 6\r'
     printf 'run 6  ok 1  fail 0  error 0\r'
blob - 50d4fd1f38db381bb0d33f43da80604b4a707801
blob + 35eceeee585255b971330d86a960d228e7ba6441
--- tests/exercise/testsuite/stderr-fd.t
+++ tests/exercise/testsuite/stderr-fd.t
@@ -11,7 +11,7 @@ export tst=$0.tests
 err=`$STAT <$0.err`             # stat it
 exec ./assert-exercise $0 \
         'run 6  ok 1  fail 2  error 3\n' \
-        "$err\\n" <<EOF
+        "$err\nfail $tst\n\n" <<EOF
 #!/bin/sh
     $STAT <&2 >&2               # stat stderr, print result to stderr
     echo 'run 6  ok 1  fail 2  error 3'
blob - d0ec8887581392b282fffa4f189280b174d90d49
blob + 86be25554f517b19b5ee549014db27cecaf7d474
--- tests/exercise/testsuite.t
+++ tests/exercise/testsuite.t
@@ -8,7 +8,7 @@
 export tst=$0.tests
 exec ./assert-exercise $0 \
         'run 6  ok 1  fail 2  error 3\n' \
-        'test test test\n' <<EOF
+        "test test test\nfail $tst\n\n" <<EOF
 #!/bin/sh
     echo 'test test test' >&2
     echo 'run 6  ok 1  fail 2  error 3'
blob - 62bfc4b3c8a7702c53c285c2a13a4d3c7f30b69c
blob + 63fd0140496c03831f050b2d3a76e85208829247
--- tests/support/adapt-tst.t
+++ tests/support/adapt-tst.t
@@ -19,9 +19,10 @@ cat >$tmp <<-"EOF"
 EOF
 chmod +x $tmp
 
-tst=$0.tests ./assert-exercise $0 \
+export tst=$0.tests
+./assert-exercise $0 \
 	"run 3  ok 2  fail 1  error 0\n" \
-	"something something unexpected\ntest_3()\tFAIL\n" \
+	"something something unexpected\ntest_3()\tFAIL\nfail $tst\n\n" \
 	<<-EOF
 		#!/bin/sh
 		exec ../../support/adapt-tst $tmp