diff --git a/test/link.zig b/test/link.zig index c00c9606264d41305aa481f0c51a5cc48e55eacc..62bdcff4b0bdc70f686de893d71bcb5a79781298 100644 --- a/test/link.zig +++ b/test/link.zig @@ -61,11 +61,7 @@ pub fn addCases(cases: *tests.StandaloneContext) void { .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", .{ + cases.addBuildFile("test/link/macho/search_strategy/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 deleted file mode 100644 index 199b31e1a0a213affd535ef60e80b52ce040a32a..0000000000000000000000000000000000000000 --- a/test/link/macho/search_dylibs_first/a.c +++ /dev/null @@ -1,7 +0,0 @@ -#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 deleted file mode 100644 index 90c6a4a84921b67ec90bdf3f2397766529f94e57..0000000000000000000000000000000000000000 --- a/test/link/macho/search_dylibs_first/build.zig +++ /dev/null @@ -1,48 +0,0 @@ -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 deleted file mode 100644 index be1647ddad887303b79225be54523615fcc251e4..0000000000000000000000000000000000000000 --- a/test/link/macho/search_dylibs_first/main.c +++ /dev/null @@ -1,9 +0,0 @@ -#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 deleted file mode 100644 index 199b31e1a0a213affd535ef60e80b52ce040a32a..0000000000000000000000000000000000000000 --- a/test/link/macho/search_paths_first/a.c +++ /dev/null @@ -1,7 +0,0 @@ -#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 deleted file mode 100644 index 63c807bd4c66b8a7d958695d22f5f588a44ff022..0000000000000000000000000000000000000000 --- a/test/link/macho/search_paths_first/build.zig +++ /dev/null @@ -1,41 +0,0 @@ -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 deleted file mode 100644 index be1647ddad887303b79225be54523615fcc251e4..0000000000000000000000000000000000000000 --- a/test/link/macho/search_paths_first/main.c +++ /dev/null @@ -1,9 +0,0 @@ -#include - -char* hello(); -extern char world[]; - -int main() { - printf("%s %s", hello(), world); - return 0; -} diff --git a/test/link/macho/search_strategy/a.c b/test/link/macho/search_strategy/a.c new file mode 100644 index 0000000000000000000000000000000000000000..199b31e1a0a213affd535ef60e80b52ce040a32a --- /dev/null +++ b/test/link/macho/search_strategy/a.c @@ -0,0 +1,7 @@ +#include + +char world[] = "world"; + +char* hello() { + return "Hello"; +} diff --git a/test/link/macho/search_strategy/build.zig b/test/link/macho/search_strategy/build.zig new file mode 100644 index 0000000000000000000000000000000000000000..c5e867c8d006e2928e81b941438343b3c70d198c --- /dev/null +++ b/test/link/macho/search_strategy/build.zig @@ -0,0 +1,68 @@ +const std = @import("std"); +const Builder = std.build.Builder; +const LibExeObjectStep = std.build.LibExeObjStep; + +pub fn build(b: *Builder) void { + const mode = b.standardReleaseOptions(); + + const test_step = b.step("test", "Test"); + test_step.dependOn(b.getInstallStep()); + + { + // -search_dylibs_first + const exe = createScenario(b, mode); + 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); + } + + { + // -search_paths_first + const exe = createScenario(b, mode); + exe.search_strategy = .paths_first; + + const run = exe.run(); + run.cwd = b.pathFromRoot("."); + run.expectStdOutEqual("Hello world"); + test_step.dependOn(&run.step); + } +} + +fn createScenario(b: *Builder, mode: std.builtin.Mode) *LibExeObjectStep { + 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")); + return exe; +} diff --git a/test/link/macho/search_strategy/main.c b/test/link/macho/search_strategy/main.c new file mode 100644 index 0000000000000000000000000000000000000000..be1647ddad887303b79225be54523615fcc251e4 --- /dev/null +++ b/test/link/macho/search_strategy/main.c @@ -0,0 +1,9 @@ +#include + +char* hello(); +extern char world[]; + +int main() { + printf("%s %s", hello(), world); + return 0; +}