| ... | ... | @@ -1,4 +1,5 @@ |
| 1 | 1 | const std = @import("std"); |
| 2 | const builtin = @import("builtin"); |
| 2 | 3 | const link = @import("link.zig"); |
| 3 | 4 | const Compilation = @import("Compilation.zig"); |
| 4 | 5 | const Allocator = std.mem.Allocator; |
| ... | ... | @@ -610,7 +611,7 @@ pub const TestContext = struct { |
| 610 | 611 | |
| 611 | 612 | fn run(self: *TestContext) !void { |
| 612 | 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 | 615 | defer root_node.end(); |
| 615 | 616 | |
| 616 | 617 | var zig_lib_directory = try introspect.findZigLibDir(std.testing.allocator); |
| ... | ... | @@ -640,8 +641,12 @@ pub const TestContext = struct { |
| 640 | 641 | var fail_count: usize = 0; |
| 641 | 642 | |
| 642 | 643 | for (self.cases.items) |case| { |
| 643 | | if (build_options.skip_non_native and case.target.getCpuArch() != std.Target.current.cpu.arch) |
| 644 | | continue; |
| 644 | if (build_options.skip_non_native) { |
| 645 | if (case.target.getCpuArch() != builtin.cpu.arch) |
| 646 | continue; |
| 647 | if (case.target.getObjectFormat() != builtin.object_format) |
| 648 | continue; |
| 649 | } |
| 645 | 650 | |
| 646 | 651 | // Skip tests that require LLVM backend when it is not available |
| 647 | 652 | if (!build_options.have_llvm and case.backend == .llvm) |
Andrew Kelley <andrew@ziglang.org> 2021-07-20 20:05:54-07:00