From c8d0fb0b212f2c618321caeeac315c1792b06035 Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Thu, 28 Apr 2022 12:11:49 +0200
Subject: [PATCH] test: migrate stage2 independent compile errors to test
 manifest parser

---
 src/test.zig                                                | 6 +++---
 .../constant_inside_comptime_function_has_compile_error.zig | 2 +-
 test/compile_errors/stage2/duplicate-unused_labels.zig      | 2 +-
 test/compile_errors/stage2/embed_outside_package.zig        | 2 +-
 test/compile_errors/stage2/import_outside_package.zig       | 2 +-
 test/compile_errors/stage2/out_of_bounds_index.zig          | 2 +-
 test/compile_errors/stage2/slice_of_null_pointer.zig        | 2 +-
 test/compile_errors/stage2/struct_duplicate_field_name.zig  | 2 +-
 .../stage2/union_access_of_inactive_field.zig               | 4 ++--
 test/compile_errors/stage2/union_duplicate_enum_field.zig   | 4 ++--
 .../stage2/union_duplicate_field_definition.zig             | 2 +-
 test/compile_errors/stage2/union_enum_field_missing.zig     | 2 +-
 test/compile_errors/stage2/union_extra_field.zig            | 2 +-
 .../stage2/union_runtime_coercion_from_enum.zig             | 2 +-
 14 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/test.zig b/src/test.zig
index 0377d8823fdc16757757241cf6830117ec167fa2..3579370c04254e30b68f2cef046aae1a18fa6036 100644
--- a/src/test.zig
+++ b/src/test.zig
@@ -42,12 +42,12 @@ test {
     defer compile_errors_dir.close();
 
     {
-        var stage2_dir = try compile_errors_dir.openDir("stage2", .{ .iterate = true });
-        defer stage2_dir.close();
+        var dir = try compile_errors_dir.openDir("stage2", .{ .iterate = true });
+        defer dir.close();
 
         // TODO make this incremental once the bug is solved that it triggers
         // See: https://github.com/ziglang/zig/issues/11344
-        ctx.addErrorCasesFromDir("stage2", stage2_dir, .stage2, .Obj, false, .independent);
+        ctx.addTestCasesFromDir(dir, .independent);
     }
 
     if (!skip_stage1) {
diff --git a/test/compile_errors/stage2/constant_inside_comptime_function_has_compile_error.zig b/test/compile_errors/stage2/constant_inside_comptime_function_has_compile_error.zig
index 969b73713f8b5b7f59983bafaf9517cbfe2eadb2..98d6104670cbb757d54c0bac7440c205a82c8459 100644
--- a/test/compile_errors/stage2/constant_inside_comptime_function_has_compile_error.zig
+++ b/test/compile_errors/stage2/constant_inside_comptime_function_has_compile_error.zig
@@ -14,7 +14,7 @@ export fn entry() void {
     _ = allocator;
 }
 
-// constant inside comptime function has compile error
+// error
 //
 // :4:5: error: unreachable code
 // :4:25: note: control flow is diverted here
diff --git a/test/compile_errors/stage2/duplicate-unused_labels.zig b/test/compile_errors/stage2/duplicate-unused_labels.zig
index 82afe4e85455fe8b1c0683ebcb325a6f6c955632..44ab48480d5857bb4eab640e7952ec0c0569fb7b 100644
--- a/test/compile_errors/stage2/duplicate-unused_labels.zig
+++ b/test/compile_errors/stage2/duplicate-unused_labels.zig
@@ -17,7 +17,7 @@ comptime {
     blk: for(@as([0]void, undefined)) |_| {}
 }
 
-// duplicate/unused labels
+// error
 //
 // :2:12: error: redefinition of label 'blk'
 // :2:5: note: previous definition here
diff --git a/test/compile_errors/stage2/embed_outside_package.zig b/test/compile_errors/stage2/embed_outside_package.zig
index 8df6b3d9af2acefaa07e5f97fea93b8722556725..9cf1a8b905278c6e1697e2fe788e3914e9bed373 100644
--- a/test/compile_errors/stage2/embed_outside_package.zig
+++ b/test/compile_errors/stage2/embed_outside_package.zig
@@ -2,6 +2,6 @@ export fn a() usize {
     return @embedFile("/root/foo").len;
 }
 
-// embed outside package
+// error
 //
 //:2:23: error: embed of file outside package path: '/root/foo'
diff --git a/test/compile_errors/stage2/import_outside_package.zig b/test/compile_errors/stage2/import_outside_package.zig
index f9de9202de3e271c3c305e7784ac1c6a0c6f8efd..6b707787548c66caa51db46544808372020a3e8e 100644
--- a/test/compile_errors/stage2/import_outside_package.zig
+++ b/test/compile_errors/stage2/import_outside_package.zig
@@ -2,6 +2,6 @@ export fn a() usize {
     return @import("../../above.zig").len;
 }
 
-// import outside package
+// error
 //
 // :2:20: error: import of file outside package path: '../../above.zig'
diff --git a/test/compile_errors/stage2/out_of_bounds_index.zig b/test/compile_errors/stage2/out_of_bounds_index.zig
index 3c34bb5d0fa49c87b4e2727ef63b38765d10ee34..614c445d46eaddb414c0ac30fdc38aa917c6f7b4 100644
--- a/test/compile_errors/stage2/out_of_bounds_index.zig
+++ b/test/compile_errors/stage2/out_of_bounds_index.zig
@@ -20,7 +20,7 @@ comptime {
     _ = slice;
 }
 
-// out of bounds indexing
+// error
 //
 // :4:26: error: end index 6 out of bounds for slice of length 4 +1 (sentinel)
 // :9:22: error: end index 6 out of bounds for array of length 4 +1 (sentinel)
diff --git a/test/compile_errors/stage2/slice_of_null_pointer.zig b/test/compile_errors/stage2/slice_of_null_pointer.zig
index 1e3f0d6aee0e0e2d36926220ce02c081ff56b9c1..a33a9048423ae4f522ec12c5ed01996bc443e50d 100644
--- a/test/compile_errors/stage2/slice_of_null_pointer.zig
+++ b/test/compile_errors/stage2/slice_of_null_pointer.zig
@@ -5,6 +5,6 @@ comptime {
     _ = y;
 }
 
-// slice of null C pointer
+// error
 //
 // :4:14: error: slice of null pointer
diff --git a/test/compile_errors/stage2/struct_duplicate_field_name.zig b/test/compile_errors/stage2/struct_duplicate_field_name.zig
index 274dce4e4a0517c7bbc5e90b9e779c2339c7bf54..e7bed78d06d6e4ae8ad00b66cbf165b6f0cbdc3a 100644
--- a/test/compile_errors/stage2/struct_duplicate_field_name.zig
+++ b/test/compile_errors/stage2/struct_duplicate_field_name.zig
@@ -8,7 +8,7 @@ export fn entry() void {
     _ = s;
 }
 
-// duplicate struct field name
+// error
 //
 // :3:5: error: duplicate struct field: 'foo'
 // :2:5: note: other field here
diff --git a/test/compile_errors/stage2/union_access_of_inactive_field.zig b/test/compile_errors/stage2/union_access_of_inactive_field.zig
index 34fa661d799a2d937b242769cdb362f644347c20..881279e1c36813cfbb1eddc3a3f432366c1cafa1 100644
--- a/test/compile_errors/stage2/union_access_of_inactive_field.zig
+++ b/test/compile_errors/stage2/union_access_of_inactive_field.zig
@@ -3,12 +3,12 @@ const U = union {
     b: u64,
 };
 comptime {
-    var u: U = .{.a = {}};
+    var u: U = .{ .a = {} };
     const v = u.b;
     _ = v;
 }
 
-// access of inactive union field
+// error
 //
 // :7:16: error: access of union field 'b' while field 'a' is active
 // :1:11: note: union declared here
diff --git a/test/compile_errors/stage2/union_duplicate_enum_field.zig b/test/compile_errors/stage2/union_duplicate_enum_field.zig
index 9044f9e97eb682da9bacc1078eb5f4ad15bf9ad7..5a08256edb9517b9c3bca110418922d2adffc599 100644
--- a/test/compile_errors/stage2/union_duplicate_enum_field.zig
+++ b/test/compile_errors/stage2/union_duplicate_enum_field.zig
@@ -1,4 +1,4 @@
-const E = enum {a, b};
+const E = enum { a, b };
 const U = union(E) {
     a: u32,
     a: u32,
@@ -9,7 +9,7 @@ export fn foo() void {
     _ = u;
 }
 
-// union with enum and duplicate fields
+// error
 //
 // :4:5: error: duplicate union field: 'a'
 // :3:5: note: other field here
diff --git a/test/compile_errors/stage2/union_duplicate_field_definition.zig b/test/compile_errors/stage2/union_duplicate_field_definition.zig
index 6ad2ae4f4e7a7c7d9adcb97edfd4600596e3c280..7aab7c4695f42e0b644cbc07baf350c005df99d0 100644
--- a/test/compile_errors/stage2/union_duplicate_field_definition.zig
+++ b/test/compile_errors/stage2/union_duplicate_field_definition.zig
@@ -8,7 +8,7 @@ export fn entry() void {
     _ = u;
 }
 
-// duplicate union field name
+// error
 //
 // :3:5: error: duplicate union field: 'foo'
 // :2:5: note: other field here
diff --git a/test/compile_errors/stage2/union_enum_field_missing.zig b/test/compile_errors/stage2/union_enum_field_missing.zig
index b29ca83d3a69c30b8ec5ff24dc9f02bb7b5caafe..638c9fec26cb4a96038df8fc412b0e51b9837a0c 100644
--- a/test/compile_errors/stage2/union_enum_field_missing.zig
+++ b/test/compile_errors/stage2/union_enum_field_missing.zig
@@ -13,7 +13,7 @@ export fn entry() usize {
     return @sizeOf(U);
 }
 
-// enum field missing in union
+// error
 //
 // :7:1: error: enum field(s) missing in union
 // :4:5: note: field 'c' missing, declared here
diff --git a/test/compile_errors/stage2/union_extra_field.zig b/test/compile_errors/stage2/union_extra_field.zig
index e8ba581aad91a43bc27c00df1bd6555230064fa1..cdfa482208dec91282cba7459b874dbff10bf580 100644
--- a/test/compile_errors/stage2/union_extra_field.zig
+++ b/test/compile_errors/stage2/union_extra_field.zig
@@ -13,7 +13,7 @@ export fn entry() usize {
     return @sizeOf(U);
 }
 
-// union extra field
+// error
 //
 // :6:1: error: enum 'tmp.E' has no field named 'd'
 // :1:11: note: enum declared here
diff --git a/test/compile_errors/stage2/union_runtime_coercion_from_enum.zig b/test/compile_errors/stage2/union_runtime_coercion_from_enum.zig
index f7e96834fd00c3f9ccbf74bf847cf70082df2b43..56cd2db83bb3501ed46699beb4ac4e69b38de2ea 100644
--- a/test/compile_errors/stage2/union_runtime_coercion_from_enum.zig
+++ b/test/compile_errors/stage2/union_runtime_coercion_from_enum.zig
@@ -14,7 +14,7 @@ export fn doTheTest() u64 {
     return u.b;
 }
 
-// runtime coercion from enum to union
+// error
 //
 // :13:19: error: runtime coercion from enum 'tmp.E' to union 'tmp.U' which has non-void fields
 // :6:5: note: field 'a' has type 'u32'
-- 
2.54.0