| author |  Andrew Kelley <andrew@ziglang.org> 2019-08-20 14:40:57-04:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2019-08-20 14:40:57-04:00 |
| log | 276eb4402b3c54adef10033d1ec54bf2053cc563 |
| tree | 43b99a9c9095517a21869dac8ab0e7e0de7ab7e7 |
| parent | 2addec8ea1f35241e9399c5da6855c427481985f |
| signature |  Commit is signed but in an unrecognized format. |
specify the target for the newest test case
2 files changed, 33 insertions(+), 21 deletions(-)
test/compile_errors.zig+18-11
| ... | ... | @@ -2,17 +2,24 @@ const tests = @import("tests.zig"); |
| 2 | 2 | const builtin = @import("builtin"); |
| 3 | 3 | |
| 4 | 4 | pub fn addCases(cases: *tests.CompileErrorContext) void { |
| 5 | cases.add( | |
| 6 | "variable in inline assembly template cannot be found", | |
| 7 | \\export fn entry() void { | |
| 8 | \\ var sp = asm volatile ( | |
| 9 | \\ "mov %[foo], sp" | |
| 10 | \\ : [bar] "=r" (-> usize) | |
| 11 | \\ ); | |
| 12 | \\} | |
| 13 | , | |
| 14 | "tmp.zig:2:14: error: could not find 'foo' in the inputs or outputs." | |
| 15 | ); | |
| 5 | cases.addCase(x: { | |
| 6 | var tc = cases.create("variable in inline assembly template cannot be found", | |
| 7 | \\export fn entry() void { | |
| 8 | \\ var sp = asm volatile ( | |
| 9 | \\ "mov %[foo], sp" | |
| 10 | \\ : [bar] "=r" (-> usize) | |
| 11 | \\ ); | |
| 12 | \\} | |
| 13 | , "tmp.zig:2:14: error: could not find 'foo' in the inputs or outputs."); | |
| 14 | tc.target = tests.Target{ | |
| 15 | .Cross = tests.CrossTarget{ | |
| 16 | .arch = .x86_64, | |
| 17 | .os = .linux, | |
| 18 | .abi = .gnu, | |
| 19 | }, | |
| 20 | }; | |
| 21 | break :x tc; | |
| 22 | }); | |
| 16 | 23 | |
| 17 | 24 | cases.add( |
| 18 | 25 | "indirect recursion of async functions detected", |
test/tests.zig+15-10
| ... | ... | @@ -2,6 +2,8 @@ const std = @import("std"); |
| 2 | 2 | const debug = std.debug; |
| 3 | 3 | const warn = debug.warn; |
| 4 | 4 | const build = std.build; |
| 5 | pub const Target = build.Target; | |
| 6 | pub const CrossTarget = build.CrossTarget; | |
| 5 | 7 | const Buffer = std.Buffer; |
| 6 | 8 | const io = std.io; |
| 7 | 9 | const fs = std.fs; |
| ... | ... | @@ -20,24 +22,18 @@ const runtime_safety = @import("runtime_safety.zig"); |
| 20 | 22 | const translate_c = @import("translate_c.zig"); |
| 21 | 23 | const gen_h = @import("gen_h.zig"); |
| 22 | 24 | |
| 23 | const TestTarget = struct { | |
| 24 | os: builtin.Os, | |
| 25 | arch: builtin.Arch, | |
| 26 | abi: builtin.Abi, | |
| 27 | }; | |
| 28 | ||
| 29 | const test_targets = [_]TestTarget{ | |
| 30 | TestTarget{ | |
| 25 | const test_targets = [_]CrossTarget{ | |
| 26 | CrossTarget{ | |
| 31 | 27 | .os = .linux, |
| 32 | 28 | .arch = .x86_64, |
| 33 | 29 | .abi = .gnu, |
| 34 | 30 | }, |
| 35 | TestTarget{ | |
| 31 | CrossTarget{ | |
| 36 | 32 | .os = .macosx, |
| 37 | 33 | .arch = .x86_64, |
| 38 | 34 | .abi = .gnu, |
| 39 | 35 | }, |
| 40 | TestTarget{ | |
| 36 | CrossTarget{ | |
| 41 | 37 | .os = .windows, |
| 42 | 38 | .arch = .x86_64, |
| 43 | 39 | .abi = .msvc, |
| ... | ... | @@ -568,6 +564,7 @@ pub const CompileErrorContext = struct { |
| 568 | 564 | link_libc: bool, |
| 569 | 565 | is_exe: bool, |
| 570 | 566 | is_test: bool, |
| 567 | target: Target = .Native, | |
| 571 | 568 | |
| 572 | 569 | const SourceFile = struct { |
| 573 | 570 | filename: []const u8, |
| ... | ... | @@ -655,6 +652,14 @@ pub const CompileErrorContext = struct { |
| 655 | 652 | zig_args.append("--output-dir") catch unreachable; |
| 656 | 653 | zig_args.append(b.pathFromRoot(b.cache_root)) catch unreachable; |
| 657 | 654 | |
| 655 | switch (self.case.target) { | |
| 656 | .Native => {}, | |
| 657 | .Cross => { | |
| 658 | try zig_args.append("-target"); | |
| 659 | try zig_args.append(try self.case.target.zigTriple(b.allocator)); | |
| 660 | }, | |
| 661 | } | |
| 662 | ||
| 658 | 663 | switch (self.build_mode) { |
| 659 | 664 | Mode.Debug => {}, |
| 660 | 665 | Mode.ReleaseSafe => zig_args.append("--release-safe") catch unreachable, |