Merge branch 'master' into zen_stdlib

1 files changed, 17 insertions, 3 deletions

diff --git a/std/special/test_runner.zig b/std/special/test_runner.zig
index 76a54a5018..857739e82d 100644
--- a/std/special/test_runner.zig
+++ b/std/special/test_runner.zig
@@ -5,11 +5,25 @@ const test_fn_list = builtin.__zig_test_fn_slice;
 const warn = std.debug.warn;
 
 pub fn main() !void {
+    var ok_count: usize = 0;
+    var skip_count: usize = 0;
     for (test_fn_list) |test_fn, i| {
         warn("Test {}/{} {}...", i + 1, test_fn_list.len, test_fn.name);
 
-        try test_fn.func();
-
-        warn("OK\n");
+        if (test_fn.func()) |_| {
+            ok_count += 1;
+            warn("OK\n");
+        } else |err| switch (err) {
+            error.SkipZigTest => {
+                skip_count += 1;
+                warn("SKIP\n");
+            },
+            else => return err,
+        }
+    }
+    if (ok_count == test_fn_list.len) {
+        warn("All tests passed.\n");
+    } else {
+        warn("{} passed; {} skipped.\n", ok_count, skip_count);
     }
 }