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

This commit is contained in:
Andrew Kelley 2018-07-21 23:32:12 -04:00
commit 44292721bf
2 changed files with 17 additions and 4 deletions

View File

@ -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,

View File

@ -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");
}