zig

commit 44292721bf6304d77ac34f2aa6c4c00d8d264d6c (tree)
parent bb1b7967111dd5add6172fb33fd9c17e7a344321
Author: Andrew Kelley <superjoe30@gmail.com>
Date:   Sat, 21 Jul 2018 23:32:12 -0400

Merge branch 'skippable-tests-issue1274' of https://github.com/kristate/zig into kristate-skippable-tests-issue1274

Diffstat:
M
std/event/tcp.zig
 | 
13
++++++++++---
M
std/special/test_runner.zig
 | 
8
+++++++-

2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/std/event/tcp.zig b/std/event/tcp.zig
@@ -123,10 +123,17 @@ pub async fn connect(loop: *Loop, _address: *const std.net.Address) !std.os.File
 }
 
 test "listen on a port, send bytes, receive bytes" {
-    if (builtin.os != builtin.Os.linux) {
-        // TODO build abstractions for other operating systems
-        return;
+    // TODO build abstractions for other operating systems
+    const skip_test: bool = switch (builtin.os) {
+        builtin.Os.linux => false,
+        //builtin.Os.macosx, builtin.Os.ios => false,
+        else => true,
+    };
+
+    if (skip_test == true) {
+        return error.skip;
     }
+
     const MyServer = struct {
         tcp_server: Server,
 
diff --git a/std/special/test_runner.zig b/std/special/test_runner.zig
@@ -8,7 +8,13 @@ pub fn main() !void {
     for (test_fn_list) |test_fn, i| {
         warn("Test {}/{} {}...", i + 1, test_fn_list.len, test_fn.name);
 
-        try test_fn.func();
+        test_fn.func() catch |err| {
+            if (err == error.skip) {
+                warn("SKIPPED\n");
+                continue;
+            }
+            return err;
+        };
 
         warn("OK\n");
     }