From f26459e59429c85f89c1d5db5817e64b74b0b4ee Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Wed, 13 Dec 2023 12:06:25 +0100 Subject: [PATCH] lib/std/Build/CheckObject: update all tests to new API --- lib/std/Build/Step/CheckObject.zig | 2 +- test/link/elf.zig | 52 ++++++++++----------- test/link/macho/dead_strip_dylibs/build.zig | 4 +- test/link/macho/dylib/build.zig | 6 +-- test/link/macho/entry/build.zig | 4 +- test/link/macho/entry_in_dylib/build.zig | 6 +-- test/link/macho/headerpad/build.zig | 8 ++-- test/link/macho/needed_framework/build.zig | 2 +- test/link/macho/needed_library/build.zig | 2 +- test/link/macho/pagezero/build.zig | 6 +-- test/link/macho/search_strategy/build.zig | 2 +- test/link/macho/stack_size/build.zig | 2 +- test/link/macho/strict_validation/build.zig | 14 +++--- test/link/macho/unwind_info/build.zig | 2 +- test/link/macho/weak_framework/build.zig | 2 +- test/link/macho/weak_library/build.zig | 2 +- test/link/wasm/archive/build.zig | 2 +- test/link/wasm/basic-features/build.zig | 2 +- test/link/wasm/bss/build.zig | 8 ++-- test/link/wasm/export-data/build.zig | 4 +- test/link/wasm/export/build.zig | 6 +-- test/link/wasm/extern-mangle/build.zig | 2 +- test/link/wasm/function-table/build.zig | 8 ++-- test/link/wasm/infer-features/build.zig | 2 +- test/link/wasm/producers/build.zig | 2 +- test/link/wasm/segments/build.zig | 8 ++-- test/link/wasm/stack_pointer/build.zig | 6 +-- test/link/wasm/type/build.zig | 2 +- test/standalone/ios/build.zig | 2 +- 29 files changed, 85 insertions(+), 85 deletions(-) diff --git a/lib/std/Build/Step/CheckObject.zig b/lib/std/Build/Step/CheckObject.zig index b8f7dee6cc3664a3dc4509599d6370be1e4b4e97..b7ef490c38af9367f9a8ed35cd2875015535630b 100644 --- a/lib/std/Build/Step/CheckObject.zig +++ b/lib/std/Build/Step/CheckObject.zig @@ -2018,7 +2018,7 @@ const ElfDumper = struct { const symtab = switch (@"type") { .symtab => ctx.symtab, .dysymtab => ctx.dysymtab, - } orelse return; + }; try writer.writeAll(switch (@"type") { .symtab => symtab_label, diff --git a/test/link/elf.zig b/test/link/elf.zig index ba33a7eeec2d64c46796a8075d10bcc962736fd6..4055ec9219eb247b155a2307829d80db1ca718f3 100644 --- a/test/link/elf.zig +++ b/test/link/elf.zig @@ -506,7 +506,7 @@ fn testCopyrelAlignment(b: *Build, opts: Options) *Step { test_step.dependOn(&run.step); const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("section headers"); check.checkExact("name .copyrel"); check.checkExact("addralign 20"); @@ -525,7 +525,7 @@ fn testCopyrelAlignment(b: *Build, opts: Options) *Step { test_step.dependOn(&run.step); const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("section headers"); check.checkExact("name .copyrel"); check.checkExact("addralign 8"); @@ -544,7 +544,7 @@ fn testCopyrelAlignment(b: *Build, opts: Options) *Step { test_step.dependOn(&run.step); const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("section headers"); check.checkExact("name .copyrel"); check.checkExact("addralign 100"); @@ -815,7 +815,7 @@ fn testEntryPoint(b: *Build, opts: Options) *Step { exe.entry = .{ .symbol_name = "foo" }; const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("header"); check.checkExact("entry 1000"); test_step.dependOn(&check.step); @@ -831,7 +831,7 @@ fn testEntryPoint(b: *Build, opts: Options) *Step { exe.entry = .{ .symbol_name = "bar" }; const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("header"); check.checkExact("entry 2000"); test_step.dependOn(&check.step); @@ -1460,13 +1460,13 @@ fn testIFuncStaticPie(b: *Build, opts: Options) *Step { test_step.dependOn(&run.step); const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("header"); check.checkExact("type DYN"); - check.checkStart(); + check.checkInHeaders(); check.checkExact("section headers"); check.checkExact("name .dynamic"); - check.checkStart(); + check.checkInHeaders(); check.checkExact("section headers"); check.checkNotPresent("name .interp"); test_step.dependOn(&check.step); @@ -1494,7 +1494,7 @@ fn testImageBase(b: *Build, opts: Options) *Step { test_step.dependOn(&run.step); const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("header"); check.checkExtract("entry {addr}"); check.checkComputeCompare("addr", .{ .op = .gte, .value = .{ .literal = 0x8000000 } }); @@ -1507,7 +1507,7 @@ fn testImageBase(b: *Build, opts: Options) *Step { exe.image_base = 0xffffffff8000000; const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("header"); check.checkExtract("entry {addr}"); check.checkComputeCompare("addr", .{ .op = .gte, .value = .{ .literal = 0xffffffff8000000 } }); @@ -1937,10 +1937,10 @@ fn testLinkingC(b: *Build, opts: Options) *Step { test_step.dependOn(&run.step); const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("header"); check.checkExact("type EXEC"); - check.checkStart(); + check.checkInHeaders(); check.checkExact("section headers"); check.checkNotPresent("name .dynamic"); test_step.dependOn(&check.step); @@ -1967,10 +1967,10 @@ fn testLinkingCpp(b: *Build, opts: Options) *Step { test_step.dependOn(&run.step); const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("header"); check.checkExact("type EXEC"); - check.checkStart(); + check.checkInHeaders(); check.checkExact("section headers"); check.checkNotPresent("name .dynamic"); test_step.dependOn(&check.step); @@ -2055,10 +2055,10 @@ fn testLinkingZig(b: *Build, opts: Options) *Step { test_step.dependOn(&run.step); const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("header"); check.checkExact("type EXEC"); - check.checkStart(); + check.checkInHeaders(); check.checkExact("section headers"); check.checkNotPresent("name .dynamic"); test_step.dependOn(&check.step); @@ -2075,7 +2075,7 @@ fn testNoEhFrameHdr(b: *Build, opts: Options) *Step { exe.linkLibC(); const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("section headers"); check.checkNotPresent("name .eh_frame_hdr"); test_step.dependOn(&check.step); @@ -2103,10 +2103,10 @@ fn testPie(b: *Build, opts: Options) *Step { test_step.dependOn(&run.step); const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("header"); check.checkExact("type DYN"); - check.checkStart(); + check.checkInHeaders(); check.checkExact("section headers"); check.checkExact("name .dynamic"); test_step.dependOn(&check.step); @@ -2326,13 +2326,13 @@ fn testRelocatableNoEhFrame(b: *Build, opts: Options) *Step { obj2.addObject(obj1); const check1 = obj1.checkObject(); - check1.checkStart(); + check1.checkInHeaders(); check1.checkExact("section headers"); check1.checkNotPresent(".eh_frame"); test_step.dependOn(&check1.step); const check2 = obj2.checkObject(); - check2.checkStart(); + check2.checkInHeaders(); check2.checkExact("section headers"); check2.checkNotPresent(".eh_frame"); test_step.dependOn(&check2.step); @@ -2369,7 +2369,7 @@ fn testSharedAbsSymbol(b: *Build, opts: Options) *Step { test_step.dependOn(&run.step); const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("header"); check.checkExact("type DYN"); // TODO fix/improve in CheckObject @@ -2390,7 +2390,7 @@ fn testSharedAbsSymbol(b: *Build, opts: Options) *Step { // test_step.dependOn(&run.step); // const check = exe.checkObject(); - // check.checkStart(); + // check.checkInHeaders(); // check.checkExact("header"); // check.checkExact("type EXEC"); // // TODO fix/improve in CheckObject @@ -2422,7 +2422,7 @@ fn testStrip(b: *Build, opts: Options) *Step { exe.linkLibC(); const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("section headers"); check.checkExact("name .debug_info"); test_step.dependOn(&check.step); @@ -2435,7 +2435,7 @@ fn testStrip(b: *Build, opts: Options) *Step { exe.linkLibC(); const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("section headers"); check.checkNotPresent("name .debug_info"); test_step.dependOn(&check.step); @@ -3521,7 +3521,7 @@ fn testZStackSize(b: *Build, opts: Options) *Step { exe.linkLibC(); const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("program headers"); check.checkExact("type GNU_STACK"); check.checkExact("memsz 800000"); diff --git a/test/link/macho/dead_strip_dylibs/build.zig b/test/link/macho/dead_strip_dylibs/build.zig index cf243b523156dc05cede7badcbd8de046cf2878e..52d7f2eac8a33617c1a85f8f12c770a3c0fe7a1c 100644 --- a/test/link/macho/dead_strip_dylibs/build.zig +++ b/test/link/macho/dead_strip_dylibs/build.zig @@ -19,11 +19,11 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize const exe = createScenario(b, optimize, "no-dead-strip"); const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("cmd LOAD_DYLIB"); check.checkContains("Cocoa"); - check.checkStart(); + check.checkInHeaders(); check.checkExact("cmd LOAD_DYLIB"); check.checkContains("libobjc"); diff --git a/test/link/macho/dylib/build.zig b/test/link/macho/dylib/build.zig index b05e4f5677b33e6a762b964c69a99c38253f9c99..beebfbdd021cb242698d7ace713ab3df0dd25262 100644 --- a/test/link/macho/dylib/build.zig +++ b/test/link/macho/dylib/build.zig @@ -25,7 +25,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize dylib.linkLibC(); const check_dylib = dylib.checkObject(); - check_dylib.checkStart(); + check_dylib.checkInHeaders(); check_dylib.checkExact("cmd ID_DYLIB"); check_dylib.checkExact("name @rpath/liba.dylib"); check_dylib.checkExact("timestamp 2"); @@ -46,14 +46,14 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize exe.linkLibC(); const check_exe = exe.checkObject(); - check_exe.checkStart(); + check_exe.checkInHeaders(); check_exe.checkExact("cmd LOAD_DYLIB"); check_exe.checkExact("name @rpath/liba.dylib"); check_exe.checkExact("timestamp 2"); check_exe.checkExact("current version 10000"); check_exe.checkExact("compatibility version 10000"); - check_exe.checkStart(); + check_exe.checkInHeaders(); check_exe.checkExact("cmd RPATH"); check_exe.checkExactPath("path", dylib.getOutputDirectorySource()); test_step.dependOn(&check_exe.step); diff --git a/test/link/macho/entry/build.zig b/test/link/macho/entry/build.zig index 9f493d2715d2aa44fa60ac01af871ca2a71f010e..9675935a9c3c0fe10ae7a58c526493c96ffa56a4 100644 --- a/test/link/macho/entry/build.zig +++ b/test/link/macho/entry/build.zig @@ -24,11 +24,11 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize const check_exe = exe.checkObject(); - check_exe.checkStart(); + check_exe.checkInHeaders(); check_exe.checkExact("segname __TEXT"); check_exe.checkExtract("vmaddr {vmaddr}"); - check_exe.checkStart(); + check_exe.checkInHeaders(); check_exe.checkExact("cmd MAIN"); check_exe.checkExtract("entryoff {entryoff}"); diff --git a/test/link/macho/entry_in_dylib/build.zig b/test/link/macho/entry_in_dylib/build.zig index eb036abe6a5f75ecebde819108a2ef47b835c23a..5b93541a5a0b98f6e56bdf58636f034d7ab556f4 100644 --- a/test/link/macho/entry_in_dylib/build.zig +++ b/test/link/macho/entry_in_dylib/build.zig @@ -34,15 +34,15 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize exe.forceUndefinedSymbol("_my_main"); const check_exe = exe.checkObject(); - check_exe.checkStart(); + check_exe.checkInHeaders(); check_exe.checkExact("segname __TEXT"); check_exe.checkExtract("vmaddr {text_vmaddr}"); - check_exe.checkStart(); + check_exe.checkInHeaders(); check_exe.checkExact("sectname __stubs"); check_exe.checkExtract("addr {stubs_vmaddr}"); - check_exe.checkStart(); + check_exe.checkInHeaders(); check_exe.checkExact("cmd MAIN"); check_exe.checkExtract("entryoff {entryoff}"); diff --git a/test/link/macho/headerpad/build.zig b/test/link/macho/headerpad/build.zig index e1aebb0a8f2c540ba0255a17b1943cf50c880487..3c0bb7c5725ca46240b5c44e30d507403e6ea4d3 100644 --- a/test/link/macho/headerpad/build.zig +++ b/test/link/macho/headerpad/build.zig @@ -21,7 +21,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize exe.headerpad_max_install_names = true; const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("sectname __text"); check.checkExtract("offset {offset}"); @@ -47,7 +47,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize exe.headerpad_size = 0x10000; const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("sectname __text"); check.checkExtract("offset {offset}"); check.checkComputeCompare("offset", .{ .op = .gte, .value = .{ .literal = 0x10000 } }); @@ -65,7 +65,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize exe.headerpad_size = 0x10000; const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("sectname __text"); check.checkExtract("offset {offset}"); check.checkComputeCompare("offset", .{ .op = .gte, .value = .{ .literal = 0x10000 } }); @@ -83,7 +83,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize exe.headerpad_max_install_names = true; const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("sectname __text"); check.checkExtract("offset {offset}"); diff --git a/test/link/macho/needed_framework/build.zig b/test/link/macho/needed_framework/build.zig index f189ef7578de6b2c7bf9b333b7cde8f6d710cfb2..45c046fe0bf52f15c7fc219685ce1d16d4008c57 100644 --- a/test/link/macho/needed_framework/build.zig +++ b/test/link/macho/needed_framework/build.zig @@ -26,7 +26,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize exe.dead_strip_dylibs = true; const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("cmd LOAD_DYLIB"); check.checkContains("Cocoa"); test_step.dependOn(&check.step); diff --git a/test/link/macho/needed_library/build.zig b/test/link/macho/needed_library/build.zig index de5d6b1ae6e3c6f945d0b219997935168398358f..cc9d2bd6465f7a641e9b286337145fc7a95864bd 100644 --- a/test/link/macho/needed_library/build.zig +++ b/test/link/macho/needed_library/build.zig @@ -39,7 +39,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize exe.dead_strip_dylibs = true; const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("cmd LOAD_DYLIB"); check.checkExact("name @rpath/liba.dylib"); test_step.dependOn(&check.step); diff --git a/test/link/macho/pagezero/build.zig b/test/link/macho/pagezero/build.zig index 5a071384644862e1bc8a064cb4e986affb3ed8e4..1ca7f28f11081ee12a093a1b276cb485ec673699 100644 --- a/test/link/macho/pagezero/build.zig +++ b/test/link/macho/pagezero/build.zig @@ -20,13 +20,13 @@ pub fn build(b: *std.Build) void { exe.pagezero_size = 0x4000; const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("LC 0"); check.checkExact("segname __PAGEZERO"); check.checkExact("vmaddr 0"); check.checkExact("vmsize 4000"); - check.checkStart(); + check.checkInHeaders(); check.checkExact("segname __TEXT"); check.checkExact("vmaddr 4000"); @@ -44,7 +44,7 @@ pub fn build(b: *std.Build) void { exe.pagezero_size = 0; const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("LC 0"); check.checkExact("segname __TEXT"); check.checkExact("vmaddr 0"); diff --git a/test/link/macho/search_strategy/build.zig b/test/link/macho/search_strategy/build.zig index b128fe71cf9c587180bfc0c98d31162314f2c951..b76de65b0eac79a2bc8b401da135e45483cd1429 100644 --- a/test/link/macho/search_strategy/build.zig +++ b/test/link/macho/search_strategy/build.zig @@ -20,7 +20,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize const exe = createScenario(b, optimize, target, "search_dylibs_first", .mode_first); const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("cmd LOAD_DYLIB"); check.checkExact("name @rpath/libsearch_dylibs_first.dylib"); test_step.dependOn(&check.step); diff --git a/test/link/macho/stack_size/build.zig b/test/link/macho/stack_size/build.zig index 4210d9802d00e2a61ccd7b8b581eb7eb828662bd..48496bd9d51e3b0a5c7133aa5cf0f5c429547189 100644 --- a/test/link/macho/stack_size/build.zig +++ b/test/link/macho/stack_size/build.zig @@ -25,7 +25,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize exe.stack_size = 0x100000000; const check_exe = exe.checkObject(); - check_exe.checkStart(); + check_exe.checkInHeaders(); check_exe.checkExact("cmd MAIN"); check_exe.checkExact("stacksize 100000000"); test_step.dependOn(&check_exe.step); diff --git a/test/link/macho/strict_validation/build.zig b/test/link/macho/strict_validation/build.zig index cc2825a458c46b43e11d76954ad9c86a376b8d26..1cfaac49103fdddf8993ff4bc5fc519a24c49dbf 100644 --- a/test/link/macho/strict_validation/build.zig +++ b/test/link/macho/strict_validation/build.zig @@ -26,13 +26,13 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize const check_exe = exe.checkObject(); - check_exe.checkStart(); + check_exe.checkInHeaders(); check_exe.checkExact("cmd SEGMENT_64"); check_exe.checkExact("segname __LINKEDIT"); check_exe.checkExtract("fileoff {fileoff}"); check_exe.checkExtract("filesz {filesz}"); - check_exe.checkStart(); + check_exe.checkInHeaders(); check_exe.checkExact("cmd DYLD_INFO_ONLY"); check_exe.checkExtract("rebaseoff {rebaseoff}"); check_exe.checkExtract("rebasesize {rebasesize}"); @@ -43,31 +43,31 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize check_exe.checkExtract("exportoff {exportoff}"); check_exe.checkExtract("exportsize {exportsize}"); - check_exe.checkStart(); + check_exe.checkInHeaders(); check_exe.checkExact("cmd FUNCTION_STARTS"); check_exe.checkExtract("dataoff {fstartoff}"); check_exe.checkExtract("datasize {fstartsize}"); - check_exe.checkStart(); + check_exe.checkInHeaders(); check_exe.checkExact("cmd DATA_IN_CODE"); check_exe.checkExtract("dataoff {diceoff}"); check_exe.checkExtract("datasize {dicesize}"); - check_exe.checkStart(); + check_exe.checkInHeaders(); check_exe.checkExact("cmd SYMTAB"); check_exe.checkExtract("symoff {symoff}"); check_exe.checkExtract("nsyms {symnsyms}"); check_exe.checkExtract("stroff {stroff}"); check_exe.checkExtract("strsize {strsize}"); - check_exe.checkStart(); + check_exe.checkInHeaders(); check_exe.checkExact("cmd DYSYMTAB"); check_exe.checkExtract("indirectsymoff {dysymoff}"); check_exe.checkExtract("nindirectsyms {dysymnsyms}"); switch (builtin.cpu.arch) { .aarch64 => { - check_exe.checkStart(); + check_exe.checkInHeaders(); check_exe.checkExact("cmd CODE_SIGNATURE"); check_exe.checkExtract("dataoff {codesigoff}"); check_exe.checkExtract("datasize {codesigsize}"); diff --git a/test/link/macho/unwind_info/build.zig b/test/link/macho/unwind_info/build.zig index fd0a80fb2180cdb36b40c7a017a05a41a39ac29b..96c4a67568bf9faa58ef0f846da66b064a251c3b 100644 --- a/test/link/macho/unwind_info/build.zig +++ b/test/link/macho/unwind_info/build.zig @@ -32,7 +32,7 @@ fn testUnwindInfo( exe.link_gc_sections = dead_strip; const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("segname __TEXT"); check.checkExact("sectname __gcc_except_tab"); check.checkExact("sectname __unwind_info"); diff --git a/test/link/macho/weak_framework/build.zig b/test/link/macho/weak_framework/build.zig index 8a71584b254cab18d209bdbc37605288b33bf5ba..dfb41b7457e73751eb61c8af211fef57579a5cdc 100644 --- a/test/link/macho/weak_framework/build.zig +++ b/test/link/macho/weak_framework/build.zig @@ -23,7 +23,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize exe.linkFrameworkWeak("Cocoa"); const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("cmd LOAD_WEAK_DYLIB"); check.checkContains("Cocoa"); test_step.dependOn(&check.step); diff --git a/test/link/macho/weak_library/build.zig b/test/link/macho/weak_library/build.zig index 14ee74a75f86d6519311dc0571cdb212bc0cf3fb..7ae7c7c2d6529dd13e253cdfbcd18c8822725335 100644 --- a/test/link/macho/weak_library/build.zig +++ b/test/link/macho/weak_library/build.zig @@ -37,7 +37,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize exe.addRPath(dylib.getEmittedBinDirectory()); const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("cmd LOAD_WEAK_DYLIB"); check.checkExact("name @rpath/liba.dylib"); diff --git a/test/link/wasm/archive/build.zig b/test/link/wasm/archive/build.zig index 3da284ac8ff505a165e3751c20339f7712e0fa94..95aea2913e9ff3ccb3526accf0c18e939cd80ff3 100644 --- a/test/link/wasm/archive/build.zig +++ b/test/link/wasm/archive/build.zig @@ -27,7 +27,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize lib.strip = false; const check = lib.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("Section custom"); check.checkExact("name __trunch"); // Ensure it was imported and resolved diff --git a/test/link/wasm/basic-features/build.zig b/test/link/wasm/basic-features/build.zig index 0566fbe2c1771954b2b43aa3f0d6fc9c1be3d66b..9cf28ea31ef81b1e020efd0e98ba00ae4d8da4ff 100644 --- a/test/link/wasm/basic-features/build.zig +++ b/test/link/wasm/basic-features/build.zig @@ -21,7 +21,7 @@ pub fn build(b: *std.Build) void { // Verify the result contains the features explicitly set on the target for the library. const check = lib.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("name target_features"); check.checkExact("features 1"); check.checkExact("+ atomics"); diff --git a/test/link/wasm/bss/build.zig b/test/link/wasm/bss/build.zig index faf8202cd96664d959f8083cc96b5a1f27589d8c..c569225f8b2548782f4229886db5497322aa749f 100644 --- a/test/link/wasm/bss/build.zig +++ b/test/link/wasm/bss/build.zig @@ -31,18 +31,18 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize_mode: std.builtin.Opt const check_lib = lib.checkObject(); // since we import memory, make sure it exists with the correct naming - check_lib.checkStart(); + check_lib.checkInHeaders(); check_lib.checkExact("Section import"); check_lib.checkExact("entries 1"); check_lib.checkExact("module env"); // default module name is "env" check_lib.checkExact("name memory"); // as per linker specification // since we are importing memory, ensure it's not exported - check_lib.checkStart(); + check_lib.checkInHeaders(); check_lib.checkNotPresent("Section export"); // validate the name of the stack pointer - check_lib.checkStart(); + check_lib.checkInHeaders(); check_lib.checkExact("Section custom"); check_lib.checkExact("type data_segment"); check_lib.checkExact("names 2"); @@ -77,7 +77,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize_mode: std.builtin.Opt lib.link_gc_sections = false; const check_lib = lib.checkObject(); - check_lib.checkStart(); + check_lib.checkInHeaders(); check_lib.checkExact("Section custom"); check_lib.checkExact("type data_segment"); check_lib.checkExact("names 2"); diff --git a/test/link/wasm/export-data/build.zig b/test/link/wasm/export-data/build.zig index 58a8795390e70030c025ad6d007dbb7819bd10b0..f1bba98d5f4bcebbf40a802aabf23641ec2ee7dc 100644 --- a/test/link/wasm/export-data/build.zig +++ b/test/link/wasm/export-data/build.zig @@ -22,7 +22,7 @@ pub fn build(b: *std.Build) void { const check_lib = lib.checkObject(); - check_lib.checkStart(); + check_lib.checkInHeaders(); check_lib.checkExact("Section global"); check_lib.checkExact("entries 3"); check_lib.checkExact("type i32"); // stack pointer so skip other fields @@ -35,7 +35,7 @@ pub fn build(b: *std.Build) void { check_lib.checkComputeCompare("foo_address", .{ .op = .eq, .value = .{ .literal = 4 } }); check_lib.checkComputeCompare("bar_address", .{ .op = .eq, .value = .{ .literal = 0 } }); - check_lib.checkStart(); + check_lib.checkInHeaders(); check_lib.checkExact("Section export"); check_lib.checkExact("entries 3"); check_lib.checkExact("name foo"); diff --git a/test/link/wasm/export/build.zig b/test/link/wasm/export/build.zig index 5c0306335dd53349e29907b43665e7f36cf960ca..2183ccd5855af1af8b2ff33fd3c09a9eaceed579 100644 --- a/test/link/wasm/export/build.zig +++ b/test/link/wasm/export/build.zig @@ -46,21 +46,21 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize force_export.use_lld = false; const check_no_export = no_export.checkObject(); - check_no_export.checkStart(); + check_no_export.checkInHeaders(); check_no_export.checkExact("Section export"); check_no_export.checkExact("entries 1"); check_no_export.checkExact("name memory"); check_no_export.checkExact("kind memory"); const check_dynamic_export = dynamic_export.checkObject(); - check_dynamic_export.checkStart(); + check_dynamic_export.checkInHeaders(); check_dynamic_export.checkExact("Section export"); check_dynamic_export.checkExact("entries 2"); check_dynamic_export.checkExact("name foo"); check_dynamic_export.checkExact("kind function"); const check_force_export = force_export.checkObject(); - check_force_export.checkStart(); + check_force_export.checkInHeaders(); check_force_export.checkExact("Section export"); check_force_export.checkExact("entries 2"); check_force_export.checkExact("name foo"); diff --git a/test/link/wasm/extern-mangle/build.zig b/test/link/wasm/extern-mangle/build.zig index 9f450c2dcc0e33afa8dbb21319e986f008ea0c70..d361dc140e96eb9a30380017b7a6eb8ec78f71a7 100644 --- a/test/link/wasm/extern-mangle/build.zig +++ b/test/link/wasm/extern-mangle/build.zig @@ -22,7 +22,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize lib.rdynamic = true; // export `foo` const check_lib = lib.checkObject(); - check_lib.checkStart(); + check_lib.checkInHeaders(); check_lib.checkExact("Section import"); check_lib.checkExact("entries 2"); // a.hello & b.hello check_lib.checkExact("module a"); diff --git a/test/link/wasm/function-table/build.zig b/test/link/wasm/function-table/build.zig index acf704347665a81a75e06284c86540225f1d5c27..5a139acb3e6b891f770897a1b1de6468d085dfe4 100644 --- a/test/link/wasm/function-table/build.zig +++ b/test/link/wasm/function-table/build.zig @@ -52,7 +52,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize const check_export = export_table.checkObject(); const check_regular = regular_table.checkObject(); - check_import.checkStart(); + check_import.checkInHeaders(); check_import.checkExact("Section import"); check_import.checkExact("entries 1"); check_import.checkExact("module env"); @@ -63,20 +63,20 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize check_import.checkNotPresent("max"); // when importing, we do not provide a max check_import.checkNotPresent("Section table"); // we're importing it - check_export.checkStart(); + check_export.checkInHeaders(); check_export.checkExact("Section export"); check_export.checkExact("entries 2"); check_export.checkExact("name __indirect_function_table"); // as per linker specification check_export.checkExact("kind table"); - check_regular.checkStart(); + check_regular.checkInHeaders(); check_regular.checkExact("Section table"); check_regular.checkExact("entries 1"); check_regular.checkExact("type funcref"); check_regular.checkExact("min 2"); // index starts at 1 & 1 function pointer = 2. check_regular.checkExact("max 2"); - check_regular.checkStart(); + check_regular.checkInHeaders(); check_regular.checkExact("Section element"); check_regular.checkExact("entries 1"); check_regular.checkExact("table index 0"); diff --git a/test/link/wasm/infer-features/build.zig b/test/link/wasm/infer-features/build.zig index 5c7fa574472ac8a2b4ce7a3b87387587f60c07ae..c883063dc5143a482f9db629402ced88958b4d6a 100644 --- a/test/link/wasm/infer-features/build.zig +++ b/test/link/wasm/infer-features/build.zig @@ -34,7 +34,7 @@ pub fn build(b: *std.Build) void { // Verify the result contains the features from the C Object file. const check = lib.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("name target_features"); check.checkExact("features 7"); check.checkExact("+ atomics"); diff --git a/test/link/wasm/producers/build.zig b/test/link/wasm/producers/build.zig index e2bd95f45065f53d6bb32f5e92578aabbde2f7e8..b66521a45691933968b968861d71b42a9dc863b8 100644 --- a/test/link/wasm/producers/build.zig +++ b/test/link/wasm/producers/build.zig @@ -29,7 +29,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize const version_fmt = "version " ++ builtin.zig_version_string; const check_lib = lib.checkObject(); - check_lib.checkStart(); + check_lib.checkInHeaders(); check_lib.checkExact("name producers"); check_lib.checkExact("fields 2"); check_lib.checkExact("field_name language"); diff --git a/test/link/wasm/segments/build.zig b/test/link/wasm/segments/build.zig index 64d25d3faeb47c8ce52622718b5fe11ed2cf1826..6ab2e4a7a320405b0c4e59409d20a25400f261ff 100644 --- a/test/link/wasm/segments/build.zig +++ b/test/link/wasm/segments/build.zig @@ -27,15 +27,15 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize b.installArtifact(lib); const check_lib = lib.checkObject(); - check_lib.checkStart(); + check_lib.checkInHeaders(); check_lib.checkExact("Section data"); check_lib.checkExact("entries 2"); // rodata & data, no bss because we're exporting memory - check_lib.checkStart(); + check_lib.checkInHeaders(); check_lib.checkExact("Section custom"); - check_lib.checkStart(); + check_lib.checkInHeaders(); check_lib.checkExact("name name"); // names custom section - check_lib.checkStart(); + check_lib.checkInHeaders(); check_lib.checkExact("type data_segment"); check_lib.checkExact("names 2"); check_lib.checkExact("index 0"); diff --git a/test/link/wasm/stack_pointer/build.zig b/test/link/wasm/stack_pointer/build.zig index da54c140ca15c815ca82f06718be77c51dd7c79c..93c0f10e1475c78b818c75f62d0e532ab17c461b 100644 --- a/test/link/wasm/stack_pointer/build.zig +++ b/test/link/wasm/stack_pointer/build.zig @@ -30,7 +30,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize const check_lib = lib.checkObject(); // ensure global exists and its initial value is equal to explitic stack size - check_lib.checkStart(); + check_lib.checkInHeaders(); check_lib.checkExact("Section global"); check_lib.checkExact("entries 1"); check_lib.checkExact("type i32"); // on wasm32 the stack pointer must be i32 @@ -39,13 +39,13 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize check_lib.checkComputeCompare("stack_pointer", .{ .op = .eq, .value = .{ .literal = lib.stack_size.? } }); // validate memory section starts after virtual stack - check_lib.checkStart(); + check_lib.checkInHeaders(); check_lib.checkExact("Section data"); check_lib.checkExtract("i32.const {data_start}"); check_lib.checkComputeCompare("data_start", .{ .op = .eq, .value = .{ .variable = "stack_pointer" } }); // validate the name of the stack pointer - check_lib.checkStart(); + check_lib.checkInHeaders(); check_lib.checkExact("Section custom"); check_lib.checkExact("type global"); check_lib.checkExact("names 1"); diff --git a/test/link/wasm/type/build.zig b/test/link/wasm/type/build.zig index de574e36e4cba50ef21683b6bab21a8a786f2134..88ded91403a56128506fb9dcc17ca03896b171d8 100644 --- a/test/link/wasm/type/build.zig +++ b/test/link/wasm/type/build.zig @@ -26,7 +26,7 @@ fn add(b: *std.Build, test_step: *std.Build.Step, optimize: std.builtin.Optimize b.installArtifact(lib); const check_lib = lib.checkObject(); - check_lib.checkStart(); + check_lib.checkInHeaders(); check_lib.checkExact("Section type"); // only 2 entries, although we have more functions. // This is to test functions with the same function signature diff --git a/test/standalone/ios/build.zig b/test/standalone/ios/build.zig index cd10af21cf0efdabfa0d1af4c1e224a258427a7b..18168688445d57cf132e6794703391aa1654f30c 100644 --- a/test/standalone/ios/build.zig +++ b/test/standalone/ios/build.zig @@ -30,7 +30,7 @@ pub fn build(b: *std.Build) void { exe.linkLibC(); const check = exe.checkObject(); - check.checkStart(); + check.checkInHeaders(); check.checkExact("cmd BUILD_VERSION"); check.checkExact("platform IOS"); test_step.dependOn(&check.step); -- 2.54.0