authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-09-24 22:57:03-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-09-24 22:57:03-07:00
logf8b3543cabc28df15e85085a72adb474b345cf93
tree8046f8fbe82d73d4bc9311f245459e92da7b029f
parent1a8669eadaedc50fd7703412389f3c97fdffb913

I think this test is still flakey

re-opens #4922

1 files changed, 8 insertions(+), 2 deletions(-)

lib/std/event/loop.zig+8-2
...@@ -112,8 +112,9 @@ pub const Loop = struct {...@@ -112,8 +112,9 @@ pub const Loop = struct {
112 /// have the correct pointer value.112 /// have the correct pointer value.
113 /// https://github.com/ziglang/zig/issues/2761 and https://github.com/ziglang/zig/issues/2765113 /// https://github.com/ziglang/zig/issues/2761 and https://github.com/ziglang/zig/issues/2765
114 pub fn init(self: *Loop) !void {114 pub fn init(self: *Loop) !void {
115 if (builtin.single_threaded115 if (builtin.single_threaded or
116 or (@hasDecl(root, "event_loop_mode") and root.event_loop_mode == .single_threaded)) {116 (@hasDecl(root, "event_loop_mode") and root.event_loop_mode == .single_threaded))
117 {
117 return self.initSingleThreaded();118 return self.initSingleThreaded();
118 } else {119 } else {
119 return self.initMultiThreaded();120 return self.initMultiThreaded();
...@@ -1257,6 +1258,11 @@ test "std.event.Loop - basic" {...@@ -1257,6 +1258,11 @@ test "std.event.Loop - basic" {
1257 // https://github.com/ziglang/zig/issues/19081258 // https://github.com/ziglang/zig/issues/1908
1258 if (builtin.single_threaded) return error.SkipZigTest;1259 if (builtin.single_threaded) return error.SkipZigTest;
12591260
1261 if (true) {
1262 // https://github.com/ziglang/zig/issues/4922
1263 return error.SkipZigTest;
1264 }
1265
1260 var loop: Loop = undefined;1266 var loop: Loop = undefined;
1261 try loop.initMultiThreaded();1267 try loop.initMultiThreaded();
1262 defer loop.deinit();1268 defer loop.deinit();