Commit b863f2548b95cdc8b2e2818ac3a26e553be155dc | zig

author	Andrew Kelley <andrew@ziglang.org> 2025-10-28 18:43:47-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2025-10-29 06:20:52-07:00
log	b863f2548b95cdc8b2e2818ac3a26e553be155dc
tree	aff027ede0c9c7b35e6704c29a42b445031d5526
parent	1c0a8b8fe4a979b0ba9e6cd790c33a6dc12f0f05

2 files changed, 20 insertions(+), 3 deletions(-)

lib/std/Io/Threaded/test.zig+14-2

...	...	@@ -1,3 +1,5 @@
	1	const builtin = @import("builtin");
	2
1	3	const std = @import("std");
2	4	const Io = std.Io;
3	5	const testing = std.testing;
...	...	@@ -12,7 +14,12 @@ test "concurrent vs main prevents deadlock via oversubscription" {
12	14
13	15	var queue: Io.Queue(u8) = .init(&.{});
14	16
15		var putter = try io.concurrent(put, .{ io, &queue });
	17	var putter = io.concurrent(put, .{ io, &queue }) catch \|err\| switch (err) {
	18	error.ConcurrencyUnavailable => {
	19	try testing.expect(builtin.single_threaded);
	20	return;
	21	},
	22	};
16	23	defer putter.cancel(io);
17	24
18	25	try testing.expectEqual(42, queue.getOneUncancelable(io));
...	...	@@ -35,7 +42,12 @@ test "concurrent vs concurrent prevents deadlock via oversubscription" {
35	42
36	43	var queue: Io.Queue(u8) = .init(&.{});
37	44
38		var putter = try io.concurrent(put, .{ io, &queue });
	45	var putter = io.concurrent(put, .{ io, &queue }) catch \|err\| switch (err) {
	46	error.ConcurrencyUnavailable => {
	47	try testing.expect(builtin.single_threaded);
	48	return;
	49	},
	50	};
39	51	defer putter.cancel(io);
40	52
41	53	var getter = try io.concurrent(get, .{ io, &queue });

lib/std/Io/test.zig+6-1

...	...	@@ -177,7 +177,12 @@ test "select" {
177	177
178	178	var queue: Io.Queue(u8) = .init(&.{});
179	179
180		var get_a = try io.concurrent(Io.Queue(u8).getOne, .{ &queue, io });
	180	var get_a = io.concurrent(Io.Queue(u8).getOne, .{ &queue, io }) catch \|err\| switch (err) {
	181	error.ConcurrencyUnavailable => {
	182	try testing.expect(builtin.single_threaded);
	183	return;
	184	},
	185	};
181	186	defer if (get_a.cancel(io)) \|_\| @panic("fail") else \|err\| assert(err == error.Canceled);
182	187
183	188	var get_b = try io.concurrent(Io.Queue(u8).getOne, .{ &queue, io });