authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-12-12 04:49:52-05:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2022-12-12 04:49:52-05:00
log4832677c3bce61725c67306c4683921296abdff9
treea64bc357b0cccab19422be5f6805ef5fd7d65366
parentd36cd49f0b3a35645c9b371344ea436725fb6c69
parent5e111098e5d78e142e0bf31d9ac13f842d8de0b4
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #13896 from coin3x/revert-aarch64-windows-test-workarounds

Revert test workarounds for aarch64-windows

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

test/standalone.zig+2-4
...@@ -31,8 +31,7 @@ pub fn addCases(cases: *tests.StandaloneContext) void {...@@ -31,8 +31,7 @@ pub fn addCases(cases: *tests.StandaloneContext) void {
31 cases.addBuildFile("test/standalone/shared_library/build.zig", .{});31 cases.addBuildFile("test/standalone/shared_library/build.zig", .{});
32 cases.addBuildFile("test/standalone/mix_o_files/build.zig", .{});32 cases.addBuildFile("test/standalone/mix_o_files/build.zig", .{});
33 cases.addBuildFile("test/standalone/mix_c_files/build.zig", .{33 cases.addBuildFile("test/standalone/mix_c_files/build.zig", .{
34 // https://github.com/ziglang/zig/issues/1373834 .build_modes = true,
35 .build_modes = !(builtin.os.tag == .windows and builtin.cpu.arch == .aarch64),
36 .cross_targets = true,35 .cross_targets = true,
37 });36 });
38 cases.addBuildFile("test/standalone/global_linkage/build.zig", .{});37 cases.addBuildFile("test/standalone/global_linkage/build.zig", .{});
...@@ -65,8 +64,7 @@ pub fn addCases(cases: *tests.StandaloneContext) void {...@@ -65,8 +64,7 @@ pub fn addCases(cases: *tests.StandaloneContext) void {
65 }64 }
6665
67 cases.addBuildFile("test/standalone/c_compiler/build.zig", .{66 cases.addBuildFile("test/standalone/c_compiler/build.zig", .{
68 // https://github.com/ziglang/zig/issues/1373867 .build_modes = true,
69 .build_modes = !(builtin.os.tag == .windows and builtin.cpu.arch == .aarch64),
70 .cross_targets = true,68 .cross_targets = true,
71 });69 });
7270