Skip to content

Commit d842821

Browse files
committed
link-test: move tls test to macho/tls
This test was always really testing correct behavior of our in-house MachO linker to begin with.
1 parent a12abc6 commit d842821

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

test/link.zig

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ const builtin = @import("builtin");
33
const tests = @import("tests.zig");
44

55
pub fn addCases(cases: *tests.StandaloneContext) void {
6-
if (builtin.os.tag == .windows) {
7-
// https://github.com/ziglang/zig/issues/12421
8-
return;
9-
}
10-
116
cases.addBuildFile("test/link/bss/build.zig", .{
127
.build_modes = false, // we only guarantee zerofill for undefined in Debug
138
});
@@ -28,10 +23,6 @@ pub fn addCases(cases: *tests.StandaloneContext) void {
2823
.build_modes = true,
2924
});
3025

31-
cases.addBuildFile("test/link/tls/build.zig", .{
32-
.build_modes = true,
33-
});
34-
3526
cases.addBuildFile("test/link/wasm/type/build.zig", .{
3627
.build_modes = true,
3728
.requires_stage2 = true,
@@ -115,4 +106,8 @@ pub fn addCases(cases: *tests.StandaloneContext) void {
115106
.build_modes = true,
116107
.requires_macos_sdk = true,
117108
});
109+
110+
cases.addBuildFile("test/link/macho/tls/build.zig", .{
111+
.build_modes = true,
112+
});
118113
}
File renamed without changes.

test/link/tls/build.zig renamed to test/link/macho/tls/build.zig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ const Builder = @import("std").build.Builder;
22

33
pub fn build(b: *Builder) void {
44
const mode = b.standardReleaseOptions();
5+
const target: std.zig.CrossTarget = .{ .os_tag = .macos };
56

67
const lib = b.addSharedLibrary("a", null, b.version(1, 0, 0));
78
lib.setBuildMode(mode);
File renamed without changes.

0 commit comments

Comments
 (0)