diff --git a/test/link.zig b/test/link.zig index 42ce12f73c..c00c960626 100644 --- a/test/link.zig +++ b/test/link.zig @@ -60,5 +60,13 @@ pub fn addCases(cases: *tests.StandaloneContext) void { cases.addBuildFile("test/link/macho/stack_size/build.zig", .{ .build_modes = true, }); + + cases.addBuildFile("test/link/macho/search_paths_first/build.zig", .{ + .build_modes = true, + }); + + cases.addBuildFile("test/link/macho/search_dylibs_first/build.zig", .{ + .build_modes = true, + }); } } diff --git a/test/link/macho/search_dylibs_first/a.c b/test/link/macho/search_dylibs_first/a.c new file mode 100644 index 0000000000..199b31e1a0 --- /dev/null +++ b/test/link/macho/search_dylibs_first/a.c @@ -0,0 +1,7 @@ +#include + +char world[] = "world"; + +char* hello() { + return "Hello"; +} diff --git a/test/link/macho/search_dylibs_first/build.zig b/test/link/macho/search_dylibs_first/build.zig new file mode 100644 index 0000000000..90c6a4a849 --- /dev/null +++ b/test/link/macho/search_dylibs_first/build.zig @@ -0,0 +1,48 @@ +const std = @import("std"); +const Builder = std.build.Builder; + +pub fn build(b: *Builder) void { + const mode = b.standardReleaseOptions(); + + const test_step = b.step("test", "Test"); + test_step.dependOn(b.getInstallStep()); + + const static = b.addStaticLibrary("a", null); + static.setBuildMode(mode); + static.addCSourceFile("a.c", &.{}); + static.linkLibC(); + static.override_dest_dir = std.build.InstallDir{ + .custom = "static", + }; + static.install(); + + const dylib = b.addSharedLibrary("a", null, b.version(1, 0, 0)); + dylib.setBuildMode(mode); + dylib.addCSourceFile("a.c", &.{}); + dylib.linkLibC(); + dylib.override_dest_dir = std.build.InstallDir{ + .custom = "dynamic", + }; + dylib.install(); + + const exe = b.addExecutable("main", null); + exe.setBuildMode(mode); + exe.addCSourceFile("main.c", &.{}); + exe.linkSystemLibraryName("a"); + exe.linkLibC(); + exe.addLibraryPath(b.pathFromRoot("zig-out/static")); + exe.addLibraryPath(b.pathFromRoot("zig-out/dynamic")); + exe.addRPath(b.pathFromRoot("zig-out/dynamic")); + exe.search_strategy = .dylibs_first; + + const check = exe.checkObject(.macho); + check.checkStart("cmd LOAD_DYLIB"); + check.checkNext("name @rpath/liba.dylib"); + + test_step.dependOn(&check.step); + + const run = exe.run(); + run.cwd = b.pathFromRoot("."); + run.expectStdOutEqual("Hello world"); + test_step.dependOn(&run.step); +} diff --git a/test/link/macho/search_dylibs_first/main.c b/test/link/macho/search_dylibs_first/main.c new file mode 100644 index 0000000000..be1647ddad --- /dev/null +++ b/test/link/macho/search_dylibs_first/main.c @@ -0,0 +1,9 @@ +#include + +char* hello(); +extern char world[]; + +int main() { + printf("%s %s", hello(), world); + return 0; +} diff --git a/test/link/macho/search_paths_first/a.c b/test/link/macho/search_paths_first/a.c new file mode 100644 index 0000000000..199b31e1a0 --- /dev/null +++ b/test/link/macho/search_paths_first/a.c @@ -0,0 +1,7 @@ +#include + +char world[] = "world"; + +char* hello() { + return "Hello"; +} diff --git a/test/link/macho/search_paths_first/build.zig b/test/link/macho/search_paths_first/build.zig new file mode 100644 index 0000000000..63c807bd4c --- /dev/null +++ b/test/link/macho/search_paths_first/build.zig @@ -0,0 +1,41 @@ +const std = @import("std"); +const Builder = std.build.Builder; + +pub fn build(b: *Builder) void { + const mode = b.standardReleaseOptions(); + + const test_step = b.step("test", "Test"); + test_step.dependOn(b.getInstallStep()); + + const static = b.addStaticLibrary("a", null); + static.setBuildMode(mode); + static.addCSourceFile("a.c", &.{}); + static.linkLibC(); + static.override_dest_dir = std.build.InstallDir{ + .custom = "static", + }; + static.install(); + + const dylib = b.addSharedLibrary("a", null, b.version(1, 0, 0)); + dylib.setBuildMode(mode); + dylib.addCSourceFile("a.c", &.{}); + dylib.linkLibC(); + dylib.override_dest_dir = std.build.InstallDir{ + .custom = "dynamic", + }; + dylib.install(); + + const exe = b.addExecutable("main", null); + exe.setBuildMode(mode); + exe.addCSourceFile("main.c", &.{}); + exe.linkSystemLibraryName("a"); + exe.linkLibC(); + exe.addLibraryPath(b.pathFromRoot("zig-out/static")); + exe.addLibraryPath(b.pathFromRoot("zig-out/dynamic")); + exe.search_strategy = .paths_first; + + const run = exe.run(); + run.cwd = b.pathFromRoot("."); + run.expectStdOutEqual("Hello world"); + test_step.dependOn(&run.step); +} diff --git a/test/link/macho/search_paths_first/main.c b/test/link/macho/search_paths_first/main.c new file mode 100644 index 0000000000..be1647ddad --- /dev/null +++ b/test/link/macho/search_paths_first/main.c @@ -0,0 +1,9 @@ +#include + +char* hello(); +extern char world[]; + +int main() { + printf("%s %s", hello(), world); + return 0; +}