authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-11-29 02:57:37+01:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2022-11-29 02:57:37+01:00
log1829b6eab8dc52ad2961467e23bfb36055cc8583
tree14917ddc2b9fa3de0c92a8e3ac31d87eb09d2a90
parent033aa1d7614f618d4b416e0c9cb52a8f03f0325f
parent7bcc1282e231829d6335a185fec2e7592bf10a04
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #13625 from kcbanner/windows_disable_symlink_tests

Skip linker tests requiring symlinks on Windows

4 files changed, 31 insertions(+), 2 deletions(-)

build.zig+3-1
......@@ -88,6 +88,7 @@ pub fn build(b: *Builder) !void {
8888 "Whether LLVM has the experimental target arc enabled",
8989 ) orelse false;
9090 const enable_macos_sdk = b.option(bool, "enable-macos-sdk", "Run tests requiring presence of macOS SDK and frameworks") orelse false;
91 const enable_symlinks_windows = b.option(bool, "enable-symlinks-windows", "Run tests requiring presence of symlinks on Windows") orelse false;
9192 const config_h_path_option = b.option([]const u8, "config_h", "Path to the generated config.h");
9293
9394 if (!skip_install_lib_files) {
......@@ -519,9 +520,10 @@ pub fn build(b: *Builder) !void {
519520 b.enable_rosetta,
520521 b.enable_wasmtime,
521522 b.enable_wine,
523 enable_symlinks_windows,
522524 ));
523525 test_step.dependOn(tests.addCAbiTests(b, skip_non_native));
524 test_step.dependOn(tests.addLinkTests(b, test_filter, modes, enable_macos_sdk, skip_stage2_tests));
526 test_step.dependOn(tests.addLinkTests(b, test_filter, modes, enable_macos_sdk, skip_stage2_tests, enable_symlinks_windows));
525527 test_step.dependOn(tests.addStackTraceTests(b, test_filter, modes));
526528 test_step.dependOn(tests.addCliTests(b, test_filter, modes));
527529 test_step.dependOn(tests.addAssembleAndLinkTests(b, test_filter, modes));
ci/windows/build.ps1+2-1
......@@ -49,7 +49,8 @@ Write-Output " zig build test docs..."
4949& "$ZIGINSTALLDIR\bin\zig.exe" build test docs `
5050 --search-prefix "$ZIGPREFIXPATH" `
5151 -Dstatic-llvm `
52 -Dskip-non-native
52 -Dskip-non-native `
53 -Denable-symlinks-windows
5354CheckLastExitCode
5455
5556# Produce the experimental std lib documentation.
test/link.zig+19
......@@ -82,83 +82,102 @@ fn addMachOCases(cases: *tests.StandaloneContext) void {
8282 cases.addBuildFile("test/link/macho/bugs/13056/build.zig", .{
8383 .build_modes = true,
8484 .requires_macos_sdk = true,
85 .requires_symlinks = true,
8586 });
8687
8788 cases.addBuildFile("test/link/macho/bugs/13457/build.zig", .{
8889 .build_modes = true,
90 .requires_symlinks = true,
8991 });
9092
9193 cases.addBuildFile("test/link/macho/dead_strip/build.zig", .{
9294 .build_modes = false,
95 .requires_symlinks = true,
9396 });
9497
9598 cases.addBuildFile("test/link/macho/dead_strip_dylibs/build.zig", .{
9699 .build_modes = true,
97100 .requires_macos_sdk = true,
101 .requires_symlinks = true,
98102 });
99103
100104 cases.addBuildFile("test/link/macho/dylib/build.zig", .{
101105 .build_modes = true,
106 .requires_symlinks = true,
102107 });
103108
104109 cases.addBuildFile("test/link/macho/empty/build.zig", .{
105110 .build_modes = true,
111 .requires_symlinks = true,
106112 });
107113
108114 cases.addBuildFile("test/link/macho/entry/build.zig", .{
109115 .build_modes = true,
116 .requires_symlinks = true,
110117 });
111118
112119 cases.addBuildFile("test/link/macho/headerpad/build.zig", .{
113120 .build_modes = true,
114121 .requires_macos_sdk = true,
122 .requires_symlinks = true,
115123 });
116124
117125 cases.addBuildFile("test/link/macho/linksection/build.zig", .{
118126 .build_modes = true,
127 .requires_symlinks = true,
119128 });
120129
121130 cases.addBuildFile("test/link/macho/needed_framework/build.zig", .{
122131 .build_modes = true,
123132 .requires_macos_sdk = true,
133 .requires_symlinks = true,
124134 });
125135
126136 cases.addBuildFile("test/link/macho/needed_library/build.zig", .{
127137 .build_modes = true,
138 .requires_symlinks = true,
128139 });
129140
130141 cases.addBuildFile("test/link/macho/objc/build.zig", .{
131142 .build_modes = true,
132143 .requires_macos_sdk = true,
144 .requires_symlinks = true,
133145 });
134146
135147 cases.addBuildFile("test/link/macho/objcpp/build.zig", .{
136148 .build_modes = true,
137149 .requires_macos_sdk = true,
150 .requires_symlinks = true,
138151 });
139152
140153 cases.addBuildFile("test/link/macho/pagezero/build.zig", .{
141154 .build_modes = false,
155 .requires_symlinks = true,
142156 });
143157
144158 cases.addBuildFile("test/link/macho/search_strategy/build.zig", .{
145159 .build_modes = true,
160 .requires_symlinks = true,
146161 });
147162
148163 cases.addBuildFile("test/link/macho/stack_size/build.zig", .{
149164 .build_modes = true,
165 .requires_symlinks = true,
150166 });
151167
152168 cases.addBuildFile("test/link/macho/tls/build.zig", .{
153169 .build_modes = true,
170 .requires_symlinks = true,
154171 });
155172
156173 cases.addBuildFile("test/link/macho/weak_library/build.zig", .{
157174 .build_modes = true,
175 .requires_symlinks = true,
158176 });
159177
160178 cases.addBuildFile("test/link/macho/weak_framework/build.zig", .{
161179 .build_modes = true,
162180 .requires_macos_sdk = true,
181 .requires_symlinks = true,
163182 });
164183}
test/tests.zig+7
......@@ -505,6 +505,7 @@ pub fn addStandaloneTests(
505505 enable_rosetta: bool,
506506 enable_wasmtime: bool,
507507 enable_wine: bool,
508 enable_symlinks_windows: bool,
508509) *build.Step {
509510 const cases = b.allocator.create(StandaloneContext) catch unreachable;
510511 cases.* = StandaloneContext{
......@@ -522,6 +523,7 @@ pub fn addStandaloneTests(
522523 .enable_rosetta = enable_rosetta,
523524 .enable_wasmtime = enable_wasmtime,
524525 .enable_wine = enable_wine,
526 .enable_symlinks_windows = enable_symlinks_windows,
525527 };
526528
527529 standalone.addCases(cases);
......@@ -535,6 +537,7 @@ pub fn addLinkTests(
535537 modes: []const Mode,
536538 enable_macos_sdk: bool,
537539 omit_stage2: bool,
540 enable_symlinks_windows: bool,
538541) *build.Step {
539542 const cases = b.allocator.create(StandaloneContext) catch unreachable;
540543 cases.* = StandaloneContext{
......@@ -547,6 +550,7 @@ pub fn addLinkTests(
547550 .enable_macos_sdk = enable_macos_sdk,
548551 .target = .{},
549552 .omit_stage2 = omit_stage2,
553 .enable_symlinks_windows = enable_symlinks_windows,
550554 };
551555 link.addCases(cases);
552556 return cases.step;
......@@ -1022,6 +1026,7 @@ pub const StandaloneContext = struct {
10221026 enable_rosetta: bool = false,
10231027 enable_wasmtime: bool = false,
10241028 enable_wine: bool = false,
1029 enable_symlinks_windows: bool,
10251030
10261031 pub fn addC(self: *StandaloneContext, root_src: []const u8) void {
10271032 self.addAllArgs(root_src, true);
......@@ -1037,11 +1042,13 @@ pub const StandaloneContext = struct {
10371042 requires_macos_sdk: bool = false,
10381043 requires_stage2: bool = false,
10391044 use_emulation: bool = false,
1045 requires_symlinks: bool = false,
10401046 }) void {
10411047 const b = self.b;
10421048
10431049 if (features.requires_macos_sdk and !self.enable_macos_sdk) return;
10441050 if (features.requires_stage2 and self.omit_stage2) return;
1051 if (features.requires_symlinks and !self.enable_symlinks_windows and builtin.os.tag == .windows) return;
10451052
10461053 const annotated_case_name = b.fmt("build {s}", .{build_file});
10471054 if (self.test_filter) |filter| {