diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2022-03-03 17:55:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-03 17:55:55 -0500 |
| commit | 6c045f9e83434e98fbfbd7c511e673274cb22afc (patch) | |
| tree | 35ba6d6b69a3df9f661ba64202f31e0d8b1b6e5f /test | |
| parent | 3605dd307ffff74726cc0ce5099599f1a6f9ddb2 (diff) | |
| parent | aa7cbca7d37bb2cd7794ffa401193cdc3f5f9849 (diff) | |
| download | zig-6c045f9e83434e98fbfbd7c511e673274cb22afc.tar.gz zig-6c045f9e83434e98fbfbd7c511e673274cb22afc.zip | |
Merge pull request #11047 from Vexu/stage2
Stage2: make `expectEqualSlices` work
Diffstat (limited to 'test')
| -rw-r--r-- | test/behavior/basic.zig | 6 | ||||
| -rw-r--r-- | test/behavior/pointers.zig | 6 | ||||
| -rw-r--r-- | test/stage2/x86_64.zig | 5 |
3 files changed, 14 insertions, 3 deletions
diff --git a/test/behavior/basic.zig b/test/behavior/basic.zig index 3d3c44cbbc..6b63c8b89b 100644 --- a/test/behavior/basic.zig +++ b/test/behavior/basic.zig @@ -747,7 +747,11 @@ fn maybe(x: bool) anyerror!?u32 { } test "pointer to thread local array" { - if (builtin.zig_backend != .stage1) return error.SkipZigTest; // TODO + if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO + if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO + if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO + if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO + if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO const s = "Hello world"; std.mem.copy(u8, buffer[0..], s); diff --git a/test/behavior/pointers.zig b/test/behavior/pointers.zig index d3d2188b12..a74ce12ab3 100644 --- a/test/behavior/pointers.zig +++ b/test/behavior/pointers.zig @@ -391,7 +391,11 @@ test "@ptrToInt on null optional at comptime" { } test "indexing array with sentinel returns correct type" { - if (builtin.zig_backend != .stage1) return error.SkipZigTest; // TODO + if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO + if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO + if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO + if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO + if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO var s: [:0]const u8 = "abc"; try testing.expectEqualSlices(u8, "*const u8", @typeName(@TypeOf(&s[0]))); diff --git a/test/stage2/x86_64.zig b/test/stage2/x86_64.zig index e482d1f7c7..aeed29bf43 100644 --- a/test/stage2/x86_64.zig +++ b/test/stage2/x86_64.zig @@ -1183,7 +1183,10 @@ pub fn addCases(ctx: *TestContext) !void { \\ if (a == 10) @compileError("bad"); \\ return a + b + c; \\} - , &[_][]const u8{":8:18: error: bad"}); + , &[_][]const u8{ + ":8:18: error: bad", + ":3:18: note: called from here", + }); case.addCompareOutput( \\pub fn main() void { |