zig

commit b863f2548b95cdc8b2e2818ac3a26e553be155dc (tree)
parent 1c0a8b8fe4a979b0ba9e6cd790c33a6dc12f0f05
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Tue, 28 Oct 2025 18:43:47 -0700

std.Io.Threaded: handle -fsingle-threaded in unit tests

Diffstat:
M
lib/std/Io/Threaded/test.zig
 | 
16
++++++++++++++--
M
lib/std/Io/test.zig
 | 
7
++++++-

2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/lib/std/Io/Threaded/test.zig b/lib/std/Io/Threaded/test.zig
@@ -1,3 +1,5 @@
+const builtin = @import("builtin");
+
 const std = @import("std");
 const Io = std.Io;
 const testing = std.testing;
@@ -12,7 +14,12 @@ test "concurrent vs main prevents deadlock via oversubscription" {
 
     var queue: Io.Queue(u8) = .init(&.{});
 
-    var putter = try io.concurrent(put, .{ io, &queue });
+    var putter = io.concurrent(put, .{ io, &queue }) catch |err| switch (err) {
+        error.ConcurrencyUnavailable => {
+            try testing.expect(builtin.single_threaded);
+            return;
+        },
+    };
     defer putter.cancel(io);
 
     try testing.expectEqual(42, queue.getOneUncancelable(io));
@@ -35,7 +42,12 @@ test "concurrent vs concurrent prevents deadlock via oversubscription" {
 
     var queue: Io.Queue(u8) = .init(&.{});
 
-    var putter = try io.concurrent(put, .{ io, &queue });
+    var putter = io.concurrent(put, .{ io, &queue }) catch |err| switch (err) {
+        error.ConcurrencyUnavailable => {
+            try testing.expect(builtin.single_threaded);
+            return;
+        },
+    };
     defer putter.cancel(io);
 
     var getter = try io.concurrent(get, .{ io, &queue });
diff --git a/lib/std/Io/test.zig b/lib/std/Io/test.zig
@@ -177,7 +177,12 @@ test "select" {
 
     var queue: Io.Queue(u8) = .init(&.{});
 
-    var get_a = try io.concurrent(Io.Queue(u8).getOne, .{ &queue, io });
+    var get_a = io.concurrent(Io.Queue(u8).getOne, .{ &queue, io }) catch |err| switch (err) {
+        error.ConcurrencyUnavailable => {
+            try testing.expect(builtin.single_threaded);
+            return;
+        },
+    };
     defer if (get_a.cancel(io)) |_| @panic("fail") else |err| assert(err == error.Canceled);
 
     var get_b = try io.concurrent(Io.Queue(u8).getOne, .{ &queue, io });