Commit 51f2442fc4160415796cf6271d1951969ab71c83 | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2022-06-22 22:24:52+02:00
committer	Jakub Konka <kubkon@jakubkonka.com> 2022-06-22 22:24:52+02:00
log	51f2442fc4160415796cf6271d1951969ab71c83
tree	1ba34f266051183294004a55c7b0cd117d69c6a7
parent	ba768614aceb486bc387e60a6026f4f48188402e

link-tests: clean up error messages in case of failure

1 files changed, 33 insertions(+), 14 deletions(-)

lib
- std
  - build
    CheckObjectStep.zig

lib/std/build/CheckObjectStep.zig+33-14

 @@ -4,6 +4,7 @@ const build = std.build;
 const fs = std.fs;
 const macho = std.macho;
 const mem = std.mem;
+const testing = std.testing;
 const CheckObjectStep = @This();
 @@ -179,13 +180,16 @@ fn make(step: *Step) !void {
             switch (act) {
                 .match => |match_act| {
                     while (it.next()) |line| {
-                        if (try match_act.match(line, &vars)) {
+                        if (try match_act.match(line, &vars)) break;
-                            std.debug.print("{s} == {s}\n", .{ line, match_act.needle });
-                            break;
-                        } else {
-                            std.debug.print("{s} != {s}\n", .{ line, match_act.needle });
-                        }
                     } else {
+                        std.debug.print(
+                            \\
+                            \\========= Expected to find: ==========================
+                            \\{s}
+                            \\========= But parsed file does not contain it: =======
+                            \\{s}
+                            \\
+                        , .{ match_act.needle, output });
                         return error.TestFailed;
                     }
                 },
 @@ -193,7 +197,17 @@ fn make(step: *Step) !void {
                     var values = std.ArrayList(u64).init(gpa);
                     try values.ensureTotalCapacity(c_eq.var_stack.items.len);
                     for (c_eq.var_stack.items) |vv| {
-                        const val = vars.get(vv) orelse return error.TestFailed;
+                        const val = vars.get(vv) orelse {
+                            std.debug.print(
+                                \\
+                                \\========= Variable was not extracted: ===========
+                                \\{s}
+                                \\========= From parsed file: =====================
+                                \\{s}
+                                \\
+                            , .{ vv, output });
+                            return error.TestFailed;
+                        };
                         values.appendAssumeCapacity(val);
                     }
 @@ -208,17 +222,22 @@ fn make(step: *Step) !void {
                         }
                     }
-                    const expected = vars.get(c_eq.expected) orelse return error.TestFailed;
+                    const expected = vars.get(c_eq.expected) orelse {
-                    if (reduced != expected) return error.TestFailed;
+                        std.debug.print(
+                            \\
+                            \\========= Variable was not extracted: ===========
+                            \\{s}
+                            \\========= From parsed file: =====================
+                            \\{s}
+                            \\
+                        , .{ c_eq.expected, output });
+                        return error.TestFailed;
+                    };
+                    try testing.expectEqual(reduced, expected);
                 },
             }
         }
     }
-    var it = vars.iterator();
-    while (it.next()) |entry| {
-        std.debug.print("  {s} => {x}\n", .{ entry.key_ptr.*, entry.value_ptr.* });
-    }
 }
 const Opts = struct {