Commit 2cd456f8f451bc73d719381bcb0f3242a1de2e04 | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2022-04-28 00:54:20+02:00
committer	Jakub Konka <kubkon@jakubkonka.com> 2022-04-28 18:35:01+02:00
log	2cd456f8f451bc73d719381bcb0f3242a1de2e04
tree	ea6913490b0b0af597547463d4f4909bc7c9d76c
parent	495bb12e6a5b5783fa14cc08c2c940ee60b80607

test: correctly handle multiple backends

To correctly handle multiple backends crossed with multiple targets,
we need to push all elements in separate allocated arrays rather
than operate on raw iterators. Hence, introduce `getConfigForKeyAlloc`.

1 files changed, 25 insertions(+), 7 deletions(-)

src
- test.zig

src/test.zig+25-7

 @@ -347,6 +347,21 @@ const TestManifest = struct {
         return self.getConfigForKeyCustomParser(key, T, getDefaultParser(T));
     }
+    fn getConfigForKeyAlloc(
+        self: TestManifest,
+        allocator: Allocator,
+        key: []const u8,
+        comptime T: type,
+    ) error{OutOfMemory}![]const T {
+        var out = std.ArrayList(T).init(allocator);
+        defer out.deinit();
+        var it = self.getConfigForKey(key, T);
+        while (it.next()) |item| {
+            try out.append(item);
+        }
+        return out.toOwnedSlice();
+    }
     fn getConfigForKeyAssertSingle(self: TestManifest, key: []const u8, comptime T: type) T {
         var it = self.getConfigForKey(key, T);
         const res = it.next().?;
 @@ -360,8 +375,9 @@ const TestManifest = struct {
         };
     }
-    fn trailingAlloc(self: TestManifest, arena: Allocator) ![]const []const u8 {
+    fn trailingAlloc(self: TestManifest, allocator: Allocator) error{OutOfMemory}![]const []const u8 {
-        var out = std.ArrayList([]const u8).init(arena);
+        var out = std.ArrayList([]const u8).init(allocator);
+        defer out.deinit();
         var it = self.trailing();
         while (it.next()) |line| {
             try out.append(line);
 @@ -1068,8 +1084,8 @@ pub const TestContext = struct {
             var manifest = try TestManifest.parse(ctx.arena, src);
             if (cases.items.len == 0) {
-                var backends = manifest.getConfigForKey("backend", Backend);
+                const backends = try manifest.getConfigForKeyAlloc(ctx.arena, "backend", Backend);
-                var targets = manifest.getConfigForKey("target", CrossTarget);
+                const targets = try manifest.getConfigForKeyAlloc(ctx.arena, "target", CrossTarget);
                 const is_test = manifest.getConfigForKeyAssertSingle("is_test", bool);
                 const output_mode = manifest.getConfigForKeyAssertSingle("output_mode", std.builtin.OutputMode);
 @@ -1081,10 +1097,11 @@ pub const TestContext = struct {
                 };
                 // Cross-product to get all possible test combinations
-                while (backends.next()) |backend| {
+                for (backends) |backend| {
-                    while (targets.next()) |target| {
+                    for (targets) |target| {
-                        const name = try std.fmt.allocPrint(ctx.arena, "{s} ({s})", .{
+                        const name = try std.fmt.allocPrint(ctx.arena, "{s} ({s}, {s})", .{
                             name_prefix,
+                            @tagName(backend),
                             try target.zigTriple(ctx.arena),
                         });
                         const next = ctx.cases.items.len;
 @@ -1095,6 +1112,7 @@ pub const TestContext = struct {
                             .updates = std.ArrayList(TestContext.Update).init(ctx.cases.allocator),
                             .is_test = is_test,
                             .output_mode = output_mode,
+                            .link_libc = backend == .llvm,
                             .files = std.ArrayList(TestContext.File).init(ctx.cases.allocator),
                         });
                         try cases.append(next);