authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-12-24 15:22:14-08:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-12-26 19:58:56-08:00
log3ad9a6a6045aec32b590387eddbc8ba3d598bcfc
tree6b6a3126600d034dd9ff008f2aa728c449d1dfc3
parenta7d2cb704596459b89bb85fb59908d384dd9bba3

incr-check: more general --debug-log CLI


1 files changed, 13 insertions(+), 21 deletions(-)

tools/incr-check.zig+13-21
......@@ -4,7 +4,7 @@ const Dir = std.Io.Dir;
44const Allocator = std.mem.Allocator;
55const Cache = std.Build.Cache;
66
7const usage = "usage: incr-check <zig binary path> <input file> [--zig-lib-dir lib] [--debug-zcu] [--debug-dwarf] [--debug-link] [--preserve-tmp] [--zig-cc-binary /path/to/zig]";
7const usage = "usage: incr-check <zig binary path> <input file> [--zig-lib-dir lib] [--debug-log foo] [--preserve-tmp] [--zig-cc-binary /path/to/zig]";
88
99pub fn main() !void {
1010 const fatal = std.process.fatal;
......@@ -23,27 +23,25 @@ pub fn main() !void {
2323 var opt_input_file_name: ?[]const u8 = null;
2424 var opt_lib_dir: ?[]const u8 = null;
2525 var opt_cc_zig: ?[]const u8 = null;
26 var debug_zcu = false;
27 var debug_dwarf = false;
28 var debug_link = false;
2926 var preserve_tmp = false;
3027 var enable_qemu: bool = false;
3128 var enable_wine: bool = false;
3229 var enable_wasmtime: bool = false;
3330 var enable_darling: bool = false;
3431
32 var debug_log_args: std.ArrayList([]const u8) = .empty;
33
3534 var arg_it = try std.process.argsWithAllocator(arena);
3635 _ = arg_it.skip();
3736 while (arg_it.next()) |arg| {
3837 if (arg.len > 0 and arg[0] == '-') {
3938 if (std.mem.eql(u8, arg, "--zig-lib-dir")) {
40 opt_lib_dir = arg_it.next() orelse fatal("expected arg after '--zig-lib-dir'\n{s}", .{usage});
41 } else if (std.mem.eql(u8, arg, "--debug-zcu")) {
42 debug_zcu = true;
43 } else if (std.mem.eql(u8, arg, "--debug-dwarf")) {
44 debug_dwarf = true;
45 } else if (std.mem.eql(u8, arg, "--debug-link")) {
46 debug_link = true;
39 opt_lib_dir = arg_it.next() orelse fatal("expected arg after --zig-lib-dir\n{s}", .{usage});
40 } else if (std.mem.eql(u8, arg, "--debug-log")) {
41 try debug_log_args.append(
42 arena,
43 arg_it.next() orelse fatal("expected arg after --debug-log\n{s}", .{usage}),
44 );
4745 } else if (std.mem.eql(u8, arg, "--preserve-tmp")) {
4846 preserve_tmp = true;
4947 } else if (std.mem.eql(u8, arg, "-fqemu")) {
......@@ -55,7 +53,7 @@ pub fn main() !void {
5553 } else if (std.mem.eql(u8, arg, "-fdarling")) {
5654 enable_darling = true;
5755 } else if (std.mem.eql(u8, arg, "--zig-cc-binary")) {
58 opt_cc_zig = arg_it.next() orelse fatal("expect arg after '--zig-cc-binary'\n{s}", .{usage});
56 opt_cc_zig = arg_it.next() orelse fatal("expected arg after --zig-cc-binary\n{s}", .{usage});
5957 } else {
6058 fatal("unknown option '{s}'\n{s}", .{ arg, usage });
6159 }
......@@ -108,7 +106,7 @@ pub fn main() !void {
108106
109107 const host = try std.zig.system.resolveTargetQuery(io, .{});
110108
111 const debug_log_verbose = debug_zcu or debug_dwarf or debug_link;
109 const debug_log_verbose = debug_log_args.items.len != 0;
112110
113111 for (case.targets) |target| {
114112 const target_prog_node = node: {
......@@ -146,14 +144,8 @@ pub fn main() !void {
146144 .llvm => try child_args.appendSlice(arena, &.{ "-fllvm", "-flld" }),
147145 .cbe => try child_args.appendSlice(arena, &.{ "-ofmt=c", "-lc" }),
148146 }
149 if (debug_zcu) {
150 try child_args.appendSlice(arena, &.{ "--debug-log", "zcu" });
151 }
152 if (debug_dwarf) {
153 try child_args.appendSlice(arena, &.{ "--debug-log", "dwarf" });
154 }
155 if (debug_link) {
156 try child_args.appendSlice(arena, &.{ "--debug-log", "link", "--debug-log", "link_state", "--debug-log", "link_relocs" });
147 for (debug_log_args.items) |arg| {
148 try child_args.appendSlice(arena, &.{ "--debug-log", arg });
157149 }
158150 for (case.modules) |mod| {
159151 try child_args.appendSlice(arena, &.{ "--dep", mod.name });