Commit aa1f9556d0e434e3e127f3460a3d6ee65ef17863 | zig

author	Andrew Kelley <andrew@ziglang.org> 2022-06-28 14:15:30-04:00
committer	GitHub <noreply@github.com> 2022-06-28 14:15:30-04:00
log	aa1f9556d0e434e3e127f3460a3d6ee65ef17863
tree	8017ab7d5d82e31ba028d7088046a8e5406a73aa
parent	975a66080790956bb5591dc8aaef6e7725e72e56
parent	914e2d4c99e17b6220d2101a5a26bf16e10a192e
signature	Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #11952 from ziglang/test-harness-improvements

Test harness improvements

3 files changed, 23 insertions(+), 19 deletions(-)

src
- test.zig
test
- cases
  - llvm
    nested_blocks.zig
  - recursive_inline_function.0.zig

src/test.zig+21-18

 @@ -235,9 +235,9 @@ const TestManifest = struct {
             inner: std.mem.SplitIterator(u8),
             parse_fn: ParseFn(T),
-            fn next(self: *@This()) ?T {
+            fn next(self: *@This()) !?T {
                 const next_raw = self.inner.next() orelse return null;
-                return self.parse_fn(next_raw);
+                return try self.parse_fn(next_raw);
             }
         };
     }
 @@ -339,20 +339,20 @@ const TestManifest = struct {
         allocator: Allocator,
         key: []const u8,
         comptime T: type,
-    ) error{OutOfMemory}![]const T {
+    ) ![]const T {
         var out = std.ArrayList(T).init(allocator);
         defer out.deinit();
         var it = self.getConfigForKey(key, T);
-        while (it.next()) |item| {
+        while (try it.next()) |item| {
             try out.append(item);
         }
         return out.toOwnedSlice();
     }
-    fn getConfigForKeyAssertSingle(self: TestManifest, key: []const u8, comptime T: type) T {
+    fn getConfigForKeyAssertSingle(self: TestManifest, key: []const u8, comptime T: type) !T {
         var it = self.getConfigForKey(key, T);
-        const res = it.next().?;
+        const res = (try it.next()) orelse unreachable;
-        assert(it.next() == null);
+        assert((try it.next()) == null);
         return res;
     }
 @@ -373,33 +373,36 @@ const TestManifest = struct {
     }
     fn ParseFn(comptime T: type) type {
-        return fn ([]const u8) ?T;
+        return fn ([]const u8) anyerror!T;
     }
     fn getDefaultParser(comptime T: type) ParseFn(T) {
         switch (@typeInfo(T)) {
             .Int => return struct {
-                fn parse(str: []const u8) ?T {
+                fn parse(str: []const u8) anyerror!T {
-                    return std.fmt.parseInt(T, str, 0) catch null;
+                    return try std.fmt.parseInt(T, str, 0);
                 }
             }.parse,
             .Bool => return struct {
-                fn parse(str: []const u8) ?T {
+                fn parse(str: []const u8) anyerror!T {
-                    const as_int = std.fmt.parseInt(u1, str, 0) catch return null;
+                    const as_int = try std.fmt.parseInt(u1, str, 0);
                     return as_int > 0;
                 }
             }.parse,
             .Enum => return struct {
-                fn parse(str: []const u8) ?T {
+                fn parse(str: []const u8) anyerror!T {
-                    return std.meta.stringToEnum(T, str);
+                    return std.meta.stringToEnum(T, str) orelse {
+                        std.log.err("unknown enum variant for {s}: {s}", .{ @typeName(T), str });
+                        return error.UnknownEnumVariant;
+                    };
                 }
             }.parse,
             .Struct => if (comptime std.mem.eql(u8, @typeName(T), "CrossTarget")) return struct {
-                fn parse(str: []const u8) ?T {
+                fn parse(str: []const u8) anyerror!T {
                     var opts = CrossTarget.ParseOptions{
                         .arch_os_abi = str,
                     };
-                    return CrossTarget.parse(opts) catch null;
+                    return try CrossTarget.parse(opts);
                 }
             }.parse else @compileError("no default parser for " ++ @typeName(T)),
             else => @compileError("no default parser for " ++ @typeName(T)),
 @@ -1128,8 +1131,8 @@ pub const TestContext = struct {
                 if (cases.items.len == 0) {
                     const backends = try manifest.getConfigForKeyAlloc(ctx.arena, "backend", Backend);
                     const targets = try manifest.getConfigForKeyAlloc(ctx.arena, "target", CrossTarget);
-                    const is_test = manifest.getConfigForKeyAssertSingle("is_test", bool);
+                    const is_test = try manifest.getConfigForKeyAssertSingle("is_test", bool);
-                    const output_mode = manifest.getConfigForKeyAssertSingle("output_mode", std.builtin.OutputMode);
+                    const output_mode = try manifest.getConfigForKeyAssertSingle("output_mode", std.builtin.OutputMode);
                     const name_prefix = blk: {
                         const ext_index = std.mem.lastIndexOfScalar(u8, current_file.*, '.') orelse

test/cases/llvm/nested_blocks.zig+1-1

...	@@ -19,6 +19,6 @@ pub fn main() void {	...	@@ -19,6 +19,6 @@ pub fn main() void {
19	}	19	}
20		20
21	// run	21	// run
22	// backend=stage2, llvm	22	// backend=stage2,llvm
23	// target=x86_64-linux,x86_64-macos	23	// target=x86_64-linux,x86_64-macos
24	//	24	//

test/cases/recursive_inline_function.0.zig+1

...	@@ -9,4 +9,5 @@ inline fn fibonacci(n: usize) usize {	...	@@ -9,4 +9,5 @@ inline fn fibonacci(n: usize) usize {
9	}	9	}
10		10
11	// run	11	// run
		12	// target=x86_64-linux,arm-linux,x86_64-macos,wasm32-wasi
12	//	13	//