From f2e8c79763723e394f57af84af977d91652568b5 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 26 May 2022 19:36:52 -0700 Subject: [PATCH] std.Progress.log: adjust API Now it will fall back to std.debug.print if there is no tty. --- lib/std/Progress.zig | 5 ++++- lib/test_runner.zig | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/std/Progress.zig b/lib/std/Progress.zig index 925cefcb74..fe2f7bc795 100644 --- a/lib/std/Progress.zig +++ b/lib/std/Progress.zig @@ -297,7 +297,10 @@ fn refreshWithHeldLock(self: *Progress) void { } pub fn log(self: *Progress, comptime format: []const u8, args: anytype) void { - const file = self.terminal orelse return; + const file = self.terminal orelse { + std.debug.print(format, args); + return; + }; self.refresh(); file.writer().print(format, args) catch { self.terminal = null; diff --git a/lib/test_runner.zig b/lib/test_runner.zig index dd88063fea..e3bc7fec86 100644 --- a/lib/test_runner.zig +++ b/lib/test_runner.zig @@ -74,7 +74,6 @@ pub fn main() void { skip_count += 1; test_node.end(); progress.log("SKIP (async test)\n", .{}); - if (!have_tty) std.debug.print("SKIP (async test)\n", .{}); continue; }, } else test_fn.func(); @@ -86,13 +85,11 @@ pub fn main() void { error.SkipZigTest => { skip_count += 1; progress.log("SKIP\n", .{}); - if (!have_tty) std.debug.print("SKIP\n", .{}); test_node.end(); }, else => { fail_count += 1; progress.log("FAIL ({s})\n", .{@errorName(err)}); - if (!have_tty) std.debug.print("FAIL ({s})\n", .{@errorName(err)}); if (@errorReturnTrace()) |trace| { std.debug.dumpStackTrace(trace.*); }