authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2024-01-15 11:01:38+01:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2024-01-24 12:34:40+01:00
log3d835dea2a5e61a6ecff6078207b808441ae937a
tree0ece341b72ee460c7b746e1c7072be5d519f6f21
parentabeb0e3ea41888dd2f4ac04ae335927aba2e7b07

test/link/macho: use .root_module. instead of wrappers where possible

1 files changed, 36 insertions(+), 36 deletions(-)

test/link/macho.zig+36-36
...@@ -217,8 +217,8 @@ fn testDylib(b: *Build, opts: Options) *Step {...@@ -217,8 +217,8 @@ fn testDylib(b: *Build, opts: Options) *Step {
217 \\}217 \\}
218 });218 });
219 exe.root_module.linkSystemLibrary("a", .{});219 exe.root_module.linkSystemLibrary("a", .{});
220 exe.addLibraryPath(dylib.getEmittedBinDirectory());220 exe.root_module.addLibraryPath(dylib.getEmittedBinDirectory());
221 exe.addRPath(dylib.getEmittedBinDirectory());221 exe.root_module.addRPath(dylib.getEmittedBinDirectory());
222222
223 const run = addRunArtifact(exe);223 const run = addRunArtifact(exe);
224 run.expectStdOutEqual("Hello world");224 run.expectStdOutEqual("Hello world");
...@@ -286,7 +286,7 @@ fn testEntryPointArchive(b: *Build, opts: Options) *Step {...@@ -286,7 +286,7 @@ fn testEntryPointArchive(b: *Build, opts: Options) *Step {
286 {286 {
287 const exe = addExecutable(b, opts, .{ .name = "main", .c_source_bytes = "" });287 const exe = addExecutable(b, opts, .{ .name = "main", .c_source_bytes = "" });
288 exe.root_module.linkSystemLibrary("main", .{});288 exe.root_module.linkSystemLibrary("main", .{});
289 exe.addLibraryPath(lib.getEmittedBinDirectory());289 exe.root_module.addLibraryPath(lib.getEmittedBinDirectory());
290290
291 const run = addRunArtifact(exe);291 const run = addRunArtifact(exe);
292 test_step.dependOn(&run.step);292 test_step.dependOn(&run.step);
...@@ -295,7 +295,7 @@ fn testEntryPointArchive(b: *Build, opts: Options) *Step {...@@ -295,7 +295,7 @@ fn testEntryPointArchive(b: *Build, opts: Options) *Step {
295 {295 {
296 const exe = addExecutable(b, opts, .{ .name = "main", .c_source_bytes = "" });296 const exe = addExecutable(b, opts, .{ .name = "main", .c_source_bytes = "" });
297 exe.root_module.linkSystemLibrary("main", .{});297 exe.root_module.linkSystemLibrary("main", .{});
298 exe.addLibraryPath(lib.getEmittedBinDirectory());298 exe.root_module.addLibraryPath(lib.getEmittedBinDirectory());
299 exe.link_gc_sections = true;299 exe.link_gc_sections = true;
300300
301 const run = addRunArtifact(exe);301 const run = addRunArtifact(exe);
...@@ -368,23 +368,23 @@ fn testHeaderpad(b: *Build, opts: Options) *Step {...@@ -368,23 +368,23 @@ fn testHeaderpad(b: *Build, opts: Options) *Step {
368 .name = name,368 .name = name,
369 .c_source_bytes = "int main() { return 0; }",369 .c_source_bytes = "int main() { return 0; }",
370 });370 });
371 exe.linkFramework("CoreFoundation");371 exe.root_module.linkFramework("CoreFoundation", .{});
372 exe.linkFramework("Foundation");372 exe.root_module.linkFramework("Foundation", .{});
373 exe.linkFramework("Cocoa");373 exe.root_module.linkFramework("Cocoa", .{});
374 exe.linkFramework("CoreGraphics");374 exe.root_module.linkFramework("CoreGraphics", .{});
375 exe.linkFramework("CoreHaptics");375 exe.root_module.linkFramework("CoreHaptics", .{});
376 exe.linkFramework("CoreAudio");376 exe.root_module.linkFramework("CoreAudio", .{});
377 exe.linkFramework("AVFoundation");377 exe.root_module.linkFramework("AVFoundation", .{});
378 exe.linkFramework("CoreImage");378 exe.root_module.linkFramework("CoreImage", .{});
379 exe.linkFramework("CoreLocation");379 exe.root_module.linkFramework("CoreLocation", .{});
380 exe.linkFramework("CoreML");380 exe.root_module.linkFramework("CoreML", .{});
381 exe.linkFramework("CoreVideo");381 exe.root_module.linkFramework("CoreVideo", .{});
382 exe.linkFramework("CoreText");382 exe.root_module.linkFramework("CoreText", .{});
383 exe.linkFramework("CryptoKit");383 exe.root_module.linkFramework("CryptoKit", .{});
384 exe.linkFramework("GameKit");384 exe.root_module.linkFramework("GameKit", .{});
385 exe.linkFramework("SwiftUI");385 exe.root_module.linkFramework("SwiftUI", .{});
386 exe.linkFramework("StoreKit");386 exe.root_module.linkFramework("StoreKit", .{});
387 exe.linkFramework("SpriteKit");387 exe.root_module.linkFramework("SpriteKit", .{});
388 return exe;388 return exe;
389 }389 }
390 }.addExe;390 }.addExe;
...@@ -814,8 +814,8 @@ fn testNeededLibrary(b: *Build, opts: Options) *Step {...@@ -814,8 +814,8 @@ fn testNeededLibrary(b: *Build, opts: Options) *Step {
814814
815 const exe = addExecutable(b, opts, .{ .name = "main", .c_source_bytes = "int main() { return 0; }" });815 const exe = addExecutable(b, opts, .{ .name = "main", .c_source_bytes = "int main() { return 0; }" });
816 exe.root_module.linkSystemLibrary("a", .{ .needed = true });816 exe.root_module.linkSystemLibrary("a", .{ .needed = true });
817 exe.addLibraryPath(dylib.getEmittedBinDirectory());817 exe.root_module.addLibraryPath(dylib.getEmittedBinDirectory());
818 exe.addRPath(dylib.getEmittedBinDirectory());818 exe.root_module.addRPath(dylib.getEmittedBinDirectory());
819 exe.dead_strip_dylibs = true;819 exe.dead_strip_dylibs = true;
820820
821 const check = exe.checkObject();821 const check = exe.checkObject();
...@@ -845,7 +845,7 @@ fn testObjc(b: *Build, opts: Options) *Step {...@@ -845,7 +845,7 @@ fn testObjc(b: *Build, opts: Options) *Step {
845 const exe = addExecutable(b, opts, .{ .name = "main", .c_source_bytes = "int main() { return 0; }" });845 const exe = addExecutable(b, opts, .{ .name = "main", .c_source_bytes = "int main() { return 0; }" });
846 exe.root_module.linkSystemLibrary("a", .{});846 exe.root_module.linkSystemLibrary("a", .{});
847 exe.root_module.linkFramework("Foundation", .{});847 exe.root_module.linkFramework("Foundation", .{});
848 exe.addLibraryPath(lib.getEmittedBinDirectory());848 exe.root_module.addLibraryPath(lib.getEmittedBinDirectory());
849849
850 const check = exe.checkObject();850 const check = exe.checkObject();
851 check.checkInSymtab();851 check.checkInSymtab();
...@@ -1205,8 +1205,8 @@ fn testTls(b: *Build, opts: Options) *Step {...@@ -1205,8 +1205,8 @@ fn testTls(b: *Build, opts: Options) *Step {
1205 \\}1205 \\}
1206 });1206 });
1207 exe.root_module.linkSystemLibrary("a", .{});1207 exe.root_module.linkSystemLibrary("a", .{});
1208 exe.addLibraryPath(dylib.getEmittedBinDirectory());1208 exe.root_module.addLibraryPath(dylib.getEmittedBinDirectory());
1209 exe.addRPath(dylib.getEmittedBinDirectory());1209 exe.root_module.addRPath(dylib.getEmittedBinDirectory());
12101210
1211 const run = addRunArtifact(exe);1211 const run = addRunArtifact(exe);
1212 run.expectStdOutEqual("2 2 2");1212 run.expectStdOutEqual("2 2 2");
...@@ -1300,10 +1300,10 @@ fn testTwoLevelNamespace(b: *Build, opts: Options) *Step {...@@ -1300,10 +1300,10 @@ fn testTwoLevelNamespace(b: *Build, opts: Options) *Step {
1300 exe.addObject(main_o);1300 exe.addObject(main_o);
1301 exe.root_module.linkSystemLibrary("a", .{});1301 exe.root_module.linkSystemLibrary("a", .{});
1302 exe.root_module.linkSystemLibrary("b", .{});1302 exe.root_module.linkSystemLibrary("b", .{});
1303 exe.addLibraryPath(liba.getEmittedBinDirectory());1303 exe.root_module.addLibraryPath(liba.getEmittedBinDirectory());
1304 exe.addLibraryPath(libb.getEmittedBinDirectory());1304 exe.root_module.addLibraryPath(libb.getEmittedBinDirectory());
1305 exe.addRPath(liba.getEmittedBinDirectory());1305 exe.root_module.addRPath(liba.getEmittedBinDirectory());
1306 exe.addRPath(libb.getEmittedBinDirectory());1306 exe.root_module.addRPath(libb.getEmittedBinDirectory());
13071307
1308 const check = exe.checkObject();1308 const check = exe.checkObject();
1309 check.checkInSymtab();1309 check.checkInSymtab();
...@@ -1329,10 +1329,10 @@ fn testTwoLevelNamespace(b: *Build, opts: Options) *Step {...@@ -1329,10 +1329,10 @@ fn testTwoLevelNamespace(b: *Build, opts: Options) *Step {
1329 exe.addObject(main_o);1329 exe.addObject(main_o);
1330 exe.root_module.linkSystemLibrary("b", .{});1330 exe.root_module.linkSystemLibrary("b", .{});
1331 exe.root_module.linkSystemLibrary("a", .{});1331 exe.root_module.linkSystemLibrary("a", .{});
1332 exe.addLibraryPath(liba.getEmittedBinDirectory());1332 exe.root_module.addLibraryPath(liba.getEmittedBinDirectory());
1333 exe.addLibraryPath(libb.getEmittedBinDirectory());1333 exe.root_module.addLibraryPath(libb.getEmittedBinDirectory());
1334 exe.addRPath(liba.getEmittedBinDirectory());1334 exe.root_module.addRPath(liba.getEmittedBinDirectory());
1335 exe.addRPath(libb.getEmittedBinDirectory());1335 exe.root_module.addRPath(libb.getEmittedBinDirectory());
13361336
1337 const check = exe.checkObject();1337 const check = exe.checkObject();
1338 check.checkInSymtab();1338 check.checkInSymtab();
...@@ -1607,8 +1607,8 @@ fn testWeakLibrary(b: *Build, opts: Options) *Step {...@@ -1607,8 +1607,8 @@ fn testWeakLibrary(b: *Build, opts: Options) *Step {
1607 \\}1607 \\}
1608 });1608 });
1609 exe.root_module.linkSystemLibrary("a", .{ .weak = true });1609 exe.root_module.linkSystemLibrary("a", .{ .weak = true });
1610 exe.addLibraryPath(dylib.getEmittedBinDirectory());1610 exe.root_module.addLibraryPath(dylib.getEmittedBinDirectory());
1611 exe.addRPath(dylib.getEmittedBinDirectory());1611 exe.root_module.addRPath(dylib.getEmittedBinDirectory());
16121612
1613 const check = exe.checkObject();1613 const check = exe.checkObject();
1614 check.checkInHeaders();1614 check.checkInHeaders();