From d721d9af69220c059a7be825d295a0b53081c4a0 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 6 Aug 2024 16:33:34 -0700 Subject: [PATCH] update coff_dwarf standalone test to new API and make it still test compilation on non-Windows --- test/standalone/coff_dwarf/build.zig | 7 ++++--- test/standalone/coff_dwarf/main.zig | 12 ++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/test/standalone/coff_dwarf/build.zig b/test/standalone/coff_dwarf/build.zig index f0a6d5a1f7..26a8a87da8 100644 --- a/test/standalone/coff_dwarf/build.zig +++ b/test/standalone/coff_dwarf/build.zig @@ -7,9 +7,10 @@ pub fn build(b: *std.Build) void { b.default_step = test_step; const optimize: std.builtin.OptimizeMode = .Debug; - const target = b.standardTargetOptions(.{}); - - if (builtin.os.tag != .windows) return; + const target = if (builtin.os.tag == .windows) + b.standardTargetOptions(.{}) + else + b.resolveTargetQuery(.{ .os_tag = .windows }); if (builtin.cpu.arch == .aarch64) { // https://github.com/ziglang/zig/issues/18427 diff --git a/test/standalone/coff_dwarf/main.zig b/test/standalone/coff_dwarf/main.zig index 1cf2587e58..18a7262a30 100644 --- a/test/standalone/coff_dwarf/main.zig +++ b/test/standalone/coff_dwarf/main.zig @@ -17,11 +17,11 @@ pub fn main() !void { const module = try debug_info.getModuleForAddress(add_addr); const symbol = try module.getSymbolAtAddress(allocator, add_addr); - defer symbol.deinit(allocator); + defer if (symbol.source_location) |sl| allocator.free(sl.file_name); - try testing.expectEqualStrings("add", symbol.symbol_name); - try testing.expect(symbol.line_info != null); - try testing.expectEqualStrings("shared_lib.c", std.fs.path.basename(symbol.line_info.?.file_name)); - try testing.expectEqual(@as(u64, 3), symbol.line_info.?.line); - try testing.expectEqual(@as(u64, 0), symbol.line_info.?.column); + try testing.expectEqualStrings("add", symbol.name); + try testing.expect(symbol.source_location != null); + try testing.expectEqualStrings("shared_lib.c", std.fs.path.basename(symbol.source_location.?.file_name)); + try testing.expectEqual(@as(u64, 3), symbol.source_location.?.line); + try testing.expectEqual(@as(u64, 0), symbol.source_location.?.column); }