authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-10-20 23:26:14-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-10-29 06:20:50-07:00
log67df66c26cdf63a637c9ac86b64f447d2053b6b3
treee354500599dba4825236547e6d2b0c29c679225c
parent4174ac18e9563c79f723e51db6c3abbb4eb3f73a

update some tests and tools for new Io APIs

7 files changed, 38 insertions(+), 16 deletions(-)

test/stack_traces.zig+10-10
......@@ -116,12 +116,12 @@ pub fn addCases(cases: *@import("tests.zig").StackTracesContext) void {
116116 .source =
117117 \\pub fn main() void {
118118 \\ var stack_trace_buf: [8]usize = undefined;
119 \\ dumpIt(&captureIt(&stack_trace_buf));
119 \\ dumpIt(captureIt(&stack_trace_buf));
120120 \\}
121121 \\fn captureIt(buf: []usize) std.builtin.StackTrace {
122122 \\ return captureItInner(buf);
123123 \\}
124 \\fn dumpIt(st: *const std.builtin.StackTrace) void {
124 \\fn dumpIt(st: std.builtin.StackTrace) void {
125125 \\ std.debug.dumpStackTrace(st);
126126 \\}
127127 \\fn captureItInner(buf: []usize) std.builtin.StackTrace {
......@@ -140,8 +140,8 @@ pub fn addCases(cases: *@import("tests.zig").StackTracesContext) void {
140140 \\ return captureItInner(buf);
141141 \\ ^
142142 \\source.zig:3:22: [address] in main
143 \\ dumpIt(&captureIt(&stack_trace_buf));
144 \\ ^
143 \\ dumpIt(captureIt(&stack_trace_buf));
144 \\ ^
145145 \\
146146 ,
147147 .expect_strip =
......@@ -157,12 +157,12 @@ pub fn addCases(cases: *@import("tests.zig").StackTracesContext) void {
157157 .source =
158158 \\pub fn main() void {
159159 \\ var stack_trace_buf: [8]usize = undefined;
160 \\ dumpIt(&captureIt(&stack_trace_buf));
160 \\ dumpIt(captureIt(&stack_trace_buf));
161161 \\}
162162 \\fn captureIt(buf: []usize) std.builtin.StackTrace {
163163 \\ return captureItInner(buf);
164164 \\}
165 \\fn dumpIt(st: *const std.builtin.StackTrace) void {
165 \\fn dumpIt(st: std.builtin.StackTrace) void {
166166 \\ std.debug.dumpStackTrace(st);
167167 \\}
168168 \\fn captureItInner(buf: []usize) std.builtin.StackTrace {
......@@ -186,12 +186,12 @@ pub fn addCases(cases: *@import("tests.zig").StackTracesContext) void {
186186 \\ t.join();
187187 \\}
188188 \\fn threadMain(stack_trace_buf: []usize) void {
189 \\ dumpIt(&captureIt(stack_trace_buf));
189 \\ dumpIt(captureIt(stack_trace_buf));
190190 \\}
191191 \\fn captureIt(buf: []usize) std.builtin.StackTrace {
192192 \\ return captureItInner(buf);
193193 \\}
194 \\fn dumpIt(st: *const std.builtin.StackTrace) void {
194 \\fn dumpIt(st: std.builtin.StackTrace) void {
195195 \\ std.debug.dumpStackTrace(st);
196196 \\}
197197 \\fn captureItInner(buf: []usize) std.builtin.StackTrace {
......@@ -210,8 +210,8 @@ pub fn addCases(cases: *@import("tests.zig").StackTracesContext) void {
210210 \\ return captureItInner(buf);
211211 \\ ^
212212 \\source.zig:7:22: [address] in threadMain
213 \\ dumpIt(&captureIt(stack_trace_buf));
214 \\ ^
213 \\ dumpIt(captureIt(stack_trace_buf));
214 \\ ^
215215 \\
216216 ,
217217 .expect_strip =
test/standalone/coff_dwarf/main.zig+5-1
......@@ -11,10 +11,14 @@ pub fn main() void {
1111 var di: std.debug.SelfInfo = .init;
1212 defer di.deinit(gpa);
1313
14 var threaded: std.Io.Threaded = .init(gpa);
15 defer threaded.deinit();
16 const io = threaded.io();
17
1418 var add_addr: usize = undefined;
1519 _ = add(1, 2, &add_addr);
1620
17 const symbol = di.getSymbol(gpa, add_addr) catch |err| fatal("failed to get symbol: {t}", .{err});
21 const symbol = di.getSymbol(gpa, io, add_addr) catch |err| fatal("failed to get symbol: {t}", .{err});
1822 defer if (symbol.source_location) |sl| gpa.free(sl.file_name);
1923
2024 if (symbol.name == null) fatal("failed to resolve symbol name", .{});
test/standalone/libfuzzer/main.zig+5-1
......@@ -15,6 +15,10 @@ pub fn main() !void {
1515 defer args.deinit();
1616 _ = args.skip(); // executable name
1717
18 var threaded: std.Io.Threaded = .init(gpa);
19 defer threaded.deinit();
20 const io = threaded.io();
21
1822 const cache_dir_path = args.next() orelse @panic("expected cache directory path argument");
1923 var cache_dir = try std.fs.cwd().openDir(cache_dir_path, .{});
2024 defer cache_dir.close();
......@@ -30,7 +34,7 @@ pub fn main() !void {
3034 defer coverage_file.close();
3135
3236 var read_buf: [@sizeOf(abi.SeenPcsHeader)]u8 = undefined;
33 var r = coverage_file.reader(&read_buf);
37 var r = coverage_file.reader(io, &read_buf);
3438 const pcs_header = r.interface.takeStruct(abi.SeenPcsHeader, native_endian) catch return r.err.?;
3539
3640 if (pcs_header.pcs_len == 0)
tools/fetch_them_macos_headers.zig+5-1
......@@ -85,8 +85,12 @@ pub fn main() anyerror!void {
8585 } else try argv.append(arg);
8686 }
8787
88 var threaded: std.Io.Threaded = .init(gpa);
89 defer threaded.deinit();
90 const io = threaded.io();
91
8892 const sysroot_path = sysroot orelse blk: {
89 const target = try std.zig.system.resolveTargetQuery(.{});
93 const target = try std.zig.system.resolveTargetQuery(io, .{});
9094 break :blk std.zig.system.darwin.getSdk(allocator, &target) orelse
9195 fatal("no SDK found; you can provide one explicitly with '--sysroot' flag", .{});
9296 };
tools/gen_macos_headers_c.zig+1-1
......@@ -33,7 +33,7 @@ pub fn main() anyerror!void {
3333
3434 if (positionals.items.len != 1) fatal("expected one positional argument: [dir]", .{});
3535
36 var dir = try std.fs.cwd().openDir(positionals.items[0], .{ .no_follow = true });
36 var dir = try std.fs.cwd().openDir(positionals.items[0], .{ .follow_symlinks = false });
3737 defer dir.close();
3838 var paths = std.array_list.Managed([]const u8).init(arena);
3939 try findHeaders(arena, dir, "", &paths);
tools/generate_c_size_and_align_checks.zig+5-1
......@@ -39,8 +39,12 @@ pub fn main() !void {
3939 std.process.exit(1);
4040 }
4141
42 var threaded: std.Io.Threaded = .init(gpa);
43 defer threaded.deinit();
44 const io = threaded.io();
45
4246 const query = try std.Target.Query.parse(.{ .arch_os_abi = args[1] });
43 const target = try std.zig.system.resolveTargetQuery(query);
47 const target = try std.zig.system.resolveTargetQuery(io, query);
4448
4549 var buffer: [2000]u8 = undefined;
4650 var stdout_writer = std.fs.File.stdout().writerStreaming(&buffer);
tools/migrate_langref.zig+7-1
......@@ -13,10 +13,16 @@ pub fn main() !void {
1313 defer arena_instance.deinit();
1414 const arena = arena_instance.allocator();
1515
16 const gpa = arena;
17
1618 const args = try std.process.argsAlloc(arena);
1719 const input_file = args[1];
1820 const output_file = args[2];
1921
22 var threaded: std.Io.Threaded = .init(gpa);
23 defer threaded.deinit();
24 const io = threaded.io();
25
2026 var in_file = try fs.cwd().openFile(input_file, .{ .mode = .read_only });
2127 defer in_file.close();
2228
......@@ -28,7 +34,7 @@ pub fn main() !void {
2834 var out_dir = try fs.cwd().openDir(fs.path.dirname(output_file).?, .{});
2935 defer out_dir.close();
3036
31 var in_file_reader = in_file.reader(&.{});
37 var in_file_reader = in_file.reader(io, &.{});
3238 const input_file_bytes = try in_file_reader.interface.allocRemaining(arena, .unlimited);
3339
3440 var tokenizer = Tokenizer.init(input_file, input_file_bytes);