authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-07-20 20:05:54-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-07-20 20:05:54-07:00
logc39c46c0d12b15874b1586ff47cf473b31867918
treea64c806e3e9900c4eb0cd281a9d6946ce07421f5
parentd15dd78abd058b13c82156e5e19ec716e860889e

stage2 tests: respect -Dskip-non-native for object formats

1 files changed, 8 insertions(+), 3 deletions(-)

src/test.zig+8-3
...@@ -1,4 +1,5 @@...@@ -1,4 +1,5 @@
1const std = @import("std");1const std = @import("std");
2const builtin = @import("builtin");
2const link = @import("link.zig");3const link = @import("link.zig");
3const Compilation = @import("Compilation.zig");4const Compilation = @import("Compilation.zig");
4const Allocator = std.mem.Allocator;5const Allocator = std.mem.Allocator;
...@@ -610,7 +611,7 @@ pub const TestContext = struct {...@@ -610,7 +611,7 @@ pub const TestContext = struct {
610611
611 fn run(self: *TestContext) !void {612 fn run(self: *TestContext) !void {
612 var progress = std.Progress{};613 var progress = std.Progress{};
613 const root_node = try progress.start("tests", self.cases.items.len);614 const root_node = try progress.start("compiler", self.cases.items.len);
614 defer root_node.end();615 defer root_node.end();
615616
616 var zig_lib_directory = try introspect.findZigLibDir(std.testing.allocator);617 var zig_lib_directory = try introspect.findZigLibDir(std.testing.allocator);
...@@ -640,8 +641,12 @@ pub const TestContext = struct {...@@ -640,8 +641,12 @@ pub const TestContext = struct {
640 var fail_count: usize = 0;641 var fail_count: usize = 0;
641642
642 for (self.cases.items) |case| {643 for (self.cases.items) |case| {
643 if (build_options.skip_non_native and case.target.getCpuArch() != std.Target.current.cpu.arch)644 if (build_options.skip_non_native) {
644 continue;645 if (case.target.getCpuArch() != builtin.cpu.arch)
646 continue;
647 if (case.target.getObjectFormat() != builtin.object_format)
648 continue;
649 }
645650
646 // Skip tests that require LLVM backend when it is not available651 // Skip tests that require LLVM backend when it is not available
647 if (!build_options.have_llvm and case.backend == .llvm)652 if (!build_options.have_llvm and case.backend == .llvm)