Commit 07c03f85a8e062923b07572a68acc0191c84f001 | zig

author	Andrew Kelley <andrew@ziglang.org> 2021-12-18 23:44:31-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-12-18 23:45:32-07:00
log	07c03f85a8e062923b07572a68acc0191c84f001
tree	d1cb78c94e593a47a28b47cf65cda0b53e8df1ef
parent	9f9f215305389c08a21730859982b68bf2681932

zig test: fix test runner detection of tty

Before, `std.Progress` was printing unwanted stuff to stderr. Now, the
test runner's logic to detect whether we should print each test as a
separate line to stderr is properly activated.

1 files changed, 9 insertions(+), 6 deletions(-)

lib
- std
  - special
    test_runner.zig

lib/std/special/test_runner.zig+9-6

...	...	@@ -31,11 +31,14 @@ pub fn main() void {
31	31	var ok_count: usize = 0;
32	32	var skip_count: usize = 0;
33	33	var fail_count: usize = 0;
34		var progress = std.Progress{};
	34	var progress = std.Progress{
	35	.dont_print_on_dumb = true,
	36	};
35	37	const root_node = progress.start("Test", test_fn_list.len) catch \|err\| switch (err) {
36	38	// TODO still run tests in this case
37	39	error.TimerUnsupported => @panic("timer unsupported"),
38	40	};
	41	const have_tty = progress.terminal != null and progress.supports_ansi_escape_codes;
39	42
40	43	var async_frame_buffer: []align(std.Target.stack_align) u8 = undefined;
41	44	// TODO this is on the next line (using `undefined` above) because otherwise zig incorrectly
...	...	@@ -55,7 +58,7 @@ pub fn main() void {
55	58	var test_node = root_node.start(test_fn.name, 0);
56	59	test_node.activate();
57	60	progress.refresh();
58		if (progress.terminal == null) {
	61	if (!have_tty) {
59	62	std.debug.print("{d}/{d} {s}... ", .{ i + 1, test_fn_list.len, test_fn.name });
60	63	}
61	64	const result = if (test_fn.async_frame_size) \|size\| switch (io_mode) {
...	...	@@ -71,26 +74,26 @@ pub fn main() void {
71	74	skip_count += 1;
72	75	test_node.end();
73	76	progress.log("{s}... SKIP (async test)\n", .{test_fn.name});
74		if (progress.terminal == null) std.debug.print("SKIP (async test)\n", .{});
	77	if (!have_tty) std.debug.print("SKIP (async test)\n", .{});
75	78	continue;
76	79	},
77	80	} else test_fn.func();
78	81	if (result) \|_\| {
79	82	ok_count += 1;
80	83	test_node.end();
81		if (progress.terminal == null) std.debug.print("OK\n", .{});
	84	if (!have_tty) std.debug.print("OK\n", .{});
82	85	} else \|err\| switch (err) {
83	86	error.SkipZigTest => {
84	87	skip_count += 1;
85	88	test_node.end();
86	89	progress.log("{s}... SKIP\n", .{test_fn.name});
87		if (progress.terminal == null) std.debug.print("SKIP\n", .{});
	90	if (!have_tty) std.debug.print("SKIP\n", .{});
88	91	},
89	92	else => {
90	93	fail_count += 1;
91	94	test_node.end();
92	95	progress.log("{s}... FAIL ({s})\n", .{ test_fn.name, @errorName(err) });
93		if (progress.terminal == null) std.debug.print("FAIL ({s})\n", .{@errorName(err)});
	96	if (!have_tty) std.debug.print("FAIL ({s})\n", .{@errorName(err)});
94	97	if (@errorReturnTrace()) \|trace\| {
95	98	std.debug.dumpStackTrace(trace.*);
96	99	}