aboutsummaryrefslogtreecommitdiff
path: root/src-self-hosted/test.zig
diff options
context:
space:
mode:
authorVexu <15308111+Vexu@users.noreply.github.com>2019-11-27 10:17:37 +0200
committerVexu <15308111+Vexu@users.noreply.github.com>2019-11-27 10:17:37 +0200
commit4d8a8e65df79ddd5edf52f961552036ccfca6e8e (patch)
treee322c74016e4d9d9d32061f1247de469c35615e5 /src-self-hosted/test.zig
parent0d55075de44ed037799b088a8e1ecf0783491da6 (diff)
downloadzig-4d8a8e65df79ddd5edf52f961552036ccfca6e8e.tar.gz
zig-4d8a8e65df79ddd5edf52f961552036ccfca6e8e.zip
add more workarounds
Diffstat (limited to 'src-self-hosted/test.zig')
-rw-r--r--src-self-hosted/test.zig15
1 files changed, 8 insertions, 7 deletions
diff --git a/src-self-hosted/test.zig b/src-self-hosted/test.zig
index 4c1ed6ad45..62b7914dbc 100644
--- a/src-self-hosted/test.zig
+++ b/src-self-hosted/test.zig
@@ -26,7 +26,8 @@ test "stage2" {
}
const file1 = "1.zig";
-const allocator = std.heap.c_allocator;
+// TODO https://github.com/ziglang/zig/issues/3783
+const allocator = std.heap.page_allocator;
pub const TestContext = struct {
zig_compiler: ZigCompiler,
@@ -94,8 +95,8 @@ pub const TestContext = struct {
&self.zig_compiler,
"test",
file1_path,
- Target.Native,
- Compilation.Kind.Obj,
+ .Native,
+ .Obj,
.Debug,
true, // is_static
self.zig_lib_dir,
@@ -128,8 +129,8 @@ pub const TestContext = struct {
&self.zig_compiler,
"test",
file1_path,
- Target.Native,
- Compilation.Kind.Exe,
+ .Native,
+ .Exe,
.Debug,
false,
self.zig_lib_dir,
@@ -170,13 +171,13 @@ pub const TestContext = struct {
return error.OutputMismatch;
}
},
- .Error => |err| return err,
+ .Error => @panic("Cannot return error: https://github.com/ziglang/zig/issues/3190"), // |err| return err,
.Fail => |msgs| {
const stderr = std.io.getStdErr();
try stderr.write("build incorrectly failed:\n");
for (msgs) |msg| {
defer msg.destroy();
- try msg.printToFile(stderr, errmsg.Color.Auto);
+ try msg.printToFile(stderr, .Auto);
}
},
}