update tests and tools to new main API

This commit is contained in:
Andrew Kelley
2025-12-31 18:28:51 -08:00
parent 9009ab2495
commit f9585ad01f
11 changed files with 33 additions and 106 deletions
+2 -10
View File
@@ -11,16 +11,8 @@
const std = @import("std"); const std = @import("std");
pub fn main() !void { pub fn main(init: std.process.Init) !void {
var arena_state = std.heap.ArenaAllocator.init(std.heap.page_allocator); var args = try init.args.iterateAllocator(init.arena);
const arena = arena_state.allocator();
defer arena_state.deinit();
try run(arena);
}
fn run(allocator: std.mem.Allocator) !void {
var args = try std.process.argsWithAllocator(allocator);
defer args.deinit(); defer args.deinit();
_ = args.next() orelse unreachable; // skip binary name _ = args.next() orelse unreachable; // skip binary name
+2 -10
View File
@@ -13,16 +13,8 @@
const std = @import("std"); const std = @import("std");
pub fn main() !void { pub fn main(init: std.process.Init) !void {
var arena_state = std.heap.ArenaAllocator.init(std.heap.page_allocator); var args = try init.args.iterateAllocator(init.arena);
const arena = arena_state.allocator();
defer arena_state.deinit();
try run(arena);
}
fn run(allocator: std.mem.Allocator) !void {
var args = try std.process.argsWithAllocator(allocator);
defer args.deinit(); defer args.deinit();
_ = args.next() orelse unreachable; // skip binary name _ = args.next() orelse unreachable; // skip binary name
+2 -10
View File
@@ -8,16 +8,8 @@
const std = @import("std"); const std = @import("std");
pub fn main() !void { pub fn main(init: std.process.Init) !void {
var arena_state = std.heap.ArenaAllocator.init(std.heap.page_allocator); var args = try init.args.iterateAllocator(init.arena);
const arena = arena_state.allocator();
defer arena_state.deinit();
try run(arena);
}
fn run(allocator: std.mem.Allocator) !void {
var args = try std.process.argsWithAllocator(allocator);
defer args.deinit(); defer args.deinit();
_ = args.next() orelse unreachable; // skip binary name _ = args.next() orelse unreachable; // skip binary name
+5 -14
View File
@@ -8,20 +8,11 @@ const Path = std.Build.Cache.Path;
const assert = std.debug.assert; const assert = std.debug.assert;
const SeenPcsHeader = std.Build.abi.fuzz.SeenPcsHeader; const SeenPcsHeader = std.Build.abi.fuzz.SeenPcsHeader;
pub fn main() !void { pub fn main(init: std.process.Init) !void {
var debug_allocator: std.heap.DebugAllocator(.{}) = .init; const gpa = init.gpa;
defer _ = debug_allocator.deinit(); const arena = init.arena;
const gpa = debug_allocator.allocator(); const io = init.io;
const args = try init.args.toSlice(arena);
var arena_instance: std.heap.ArenaAllocator = .init(gpa);
defer arena_instance.deinit();
const arena = arena_instance.allocator();
var threaded: Io.Threaded = .init(gpa, .{});
defer threaded.deinit();
const io = threaded.io();
const args = try std.process.argsAlloc(arena);
const target_query_str = switch (args.len) { const target_query_str = switch (args.len) {
3 => "native", 3 => "native",
+3 -6
View File
@@ -66,12 +66,9 @@ const usage =
\\-h, --help Print this help and exit \\-h, --help Print this help and exit
; ;
pub fn main() anyerror!void { pub fn main(init: std.process.Init) !void {
var arena = std.heap.ArenaAllocator.init(gpa); const allocator = init.arena;
defer arena.deinit(); const args = try init.args.toSlice(allocator);
const allocator = arena.allocator();
const args = try std.process.argsAlloc(allocator);
var argv = std.array_list.Managed([]const u8).init(allocator); var argv = std.array_list.Managed([]const u8).init(allocator);
var sysroot: ?[]const u8 = null; var sysroot: ?[]const u8 = null;
+4 -12
View File
@@ -6,9 +6,6 @@ const info = std.log.info;
const fatal = std.process.fatal; const fatal = std.process.fatal;
const Allocator = std.mem.Allocator; const Allocator = std.mem.Allocator;
var general_purpose_allocator = std.heap.GeneralPurposeAllocator(.{}){};
const gpa = general_purpose_allocator.allocator();
const usage = const usage =
\\gen_macos_headers_c [dir] \\gen_macos_headers_c [dir]
\\ \\
@@ -16,16 +13,11 @@ const usage =
\\-h, --help Print this help and exit \\-h, --help Print this help and exit
; ;
pub fn main() anyerror!void { pub fn main(init: std.process.Init) !void {
var arena_allocator = std.heap.ArenaAllocator.init(gpa); const arena = init.arena;
defer arena_allocator.deinit(); const io = init.io;
const arena = arena_allocator.allocator();
var threaded: Io.Threaded = .init(gpa, .{}); const args = try init.args.toSlice(arena);
defer threaded.deinit();
const io = threaded.io();
const args = try std.process.argsAlloc(arena);
if (args.len == 1) fatal("no command or option specified", .{}); if (args.len == 1) fatal("no command or option specified", .{});
var positionals = std.array_list.Managed([]const u8).init(arena); var positionals = std.array_list.Managed([]const u8).init(arena);
+3 -8
View File
@@ -11,14 +11,9 @@ const AtomicOp = enum {
ldset, ldset,
}; };
pub fn main() !void { pub fn main(init: std.process.Init) !void {
var arena_instance = std.heap.ArenaAllocator.init(std.heap.page_allocator); const arena = init.arena;
defer arena_instance.deinit(); const io = init.io;
const arena = arena_instance.allocator();
var threaded: std.Io.Threaded = .init(arena, .{});
defer threaded.deinit();
const io = threaded.io();
//const args = try std.process.argsAlloc(arena); //const args = try std.process.argsAlloc(arena);
+3 -7
View File
@@ -3,13 +3,9 @@
const std = @import("std"); const std = @import("std");
const Io = std.Io; const Io = std.Io;
pub fn main() !void { pub fn main(init: std.process.Init) !void {
var gpa: std.heap.GeneralPurposeAllocator(.{}) = .init; const allocator = init.gpa;
var allocator = gpa.allocator(); const io = init.io;
var threaded: std.Io.Threaded = .init(allocator, .{});
defer threaded.deinit();
const io = threaded.io();
var stdout_buffer: [2000]u8 = undefined; var stdout_buffer: [2000]u8 = undefined;
var stdout_writer = Io.File.stdout().writerStreaming(io, &stdout_buffer); var stdout_writer = Io.File.stdout().writerStreaming(io, &stdout_buffer);
+3 -10
View File
@@ -28,22 +28,15 @@ fn cName(ty: std.Target.CType) []const u8 {
var general_purpose_allocator: std.heap.GeneralPurposeAllocator(.{}) = .init; var general_purpose_allocator: std.heap.GeneralPurposeAllocator(.{}) = .init;
pub fn main() !void { pub fn main(init: std.process.Init) !void {
const gpa = general_purpose_allocator.allocator(); const args = try init.args.toSlice(init.arena);
defer std.debug.assert(general_purpose_allocator.deinit() == .ok); const io = init.io;
const args = try std.process.argsAlloc(gpa);
defer std.process.argsFree(gpa, args);
if (args.len != 2) { if (args.len != 2) {
std.debug.print("Usage: {s} [target_triple]\n", .{args[0]}); std.debug.print("Usage: {s} [target_triple]\n", .{args[0]});
std.process.exit(1); std.process.exit(1);
} }
var threaded: std.Io.Threaded = .init(gpa, .{});
defer threaded.deinit();
const io = threaded.io();
const query = try std.Target.Query.parse(.{ .arch_os_abi = args[1] }); const query = try std.Target.Query.parse(.{ .arch_os_abi = args[1] });
const target = try std.zig.system.resolveTargetQuery(io, query); const target = try std.zig.system.resolveTargetQuery(io, query);
+3 -8
View File
@@ -170,14 +170,9 @@ const architectures: []const Arch = &.{
// .{ .@"var" = "Microblaze", .table = .{ .specific = "arch/microblaze/kernel/syscalls/syscall.tbl" } }, // .{ .@"var" = "Microblaze", .table = .{ .specific = "arch/microblaze/kernel/syscalls/syscall.tbl" } },
}; };
pub fn main() !void { pub fn main(init: std.process.Init) !void {
var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator); const gpa = init.gpa;
defer arena.deinit(); const io = init.io;
const gpa = arena.allocator();
var threaded: Io.Threaded = .init(gpa, .{});
defer threaded.deinit();
const io = threaded.io();
const args = try std.process.argsAlloc(gpa); const args = try std.process.argsAlloc(gpa);
if (args.len < 2 or mem.eql(u8, args[1], "--help")) { if (args.len < 2 or mem.eql(u8, args[1], "--help")) {
+3 -11
View File
@@ -27,18 +27,10 @@ fn logImpl(
); );
} }
pub fn main() !void { pub fn main(init: std.process.Init) !void {
const fatal = std.process.fatal; const fatal = std.process.fatal;
const arena = init.arena;
var arena_instance = std.heap.ArenaAllocator.init(std.heap.page_allocator); const io = init.io;
defer arena_instance.deinit();
const arena = arena_instance.allocator();
const gpa = arena;
var threaded: Io.Threaded = .init(gpa, .{});
defer threaded.deinit();
const io = threaded.io();
var opt_zig_exe: ?[]const u8 = null; var opt_zig_exe: ?[]const u8 = null;
var opt_input_file_name: ?[]const u8 = null; var opt_input_file_name: ?[]const u8 = null;