aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2019-10-21 22:20:45 -0400
committerAndrew Kelley <andrew@ziglang.org>2019-10-21 22:21:18 -0400
commit064377be9aaf409bf483f512354ef22f656bf213 (patch)
tree4cdaf2fe444083c465c2b81e3a8b780c9bdd2ebe
parentfc6f84f3f08aca0d4e2352091cc2db2ca5779c7d (diff)
downloadzig-064377be9aaf409bf483f512354ef22f656bf213.tar.gz
zig-064377be9aaf409bf483f512354ef22f656bf213.zip
test runner: restore previous behavior of printing all tests passed
-rw-r--r--lib/std/special/test_runner.zig7
-rw-r--r--test/cli.zig2
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/std/special/test_runner.zig b/lib/std/special/test_runner.zig
index 78db63e4d6..f835401e1c 100644
--- a/lib/std/special/test_runner.zig
+++ b/lib/std/special/test_runner.zig
@@ -31,8 +31,9 @@ pub fn main() anyerror!void {
}
}
root_node.end();
- if (ok_count != test_fn_list.len) {
- progress.log("{} passed; {} skipped.\n", ok_count, skip_count);
- if (progress.terminal == null) std.debug.warn("{} passed; {} skipped.\n", ok_count, skip_count);
+ if (ok_count == test_fn_list.len) {
+ std.debug.warn("All tests passed.\n");
+ } else {
+ std.debug.warn("{} passed; {} skipped.\n", ok_count, skip_count);
}
}
diff --git a/test/cli.zig b/test/cli.zig
index 2999df14b0..6095536422 100644
--- a/test/cli.zig
+++ b/test/cli.zig
@@ -87,7 +87,7 @@ fn exec(cwd: []const u8, argv: []const []const u8) !ChildProcess.ExecResult {
fn testZigInitLib(zig_exe: []const u8, dir_path: []const u8) !void {
_ = try exec(dir_path, [_][]const u8{ zig_exe, "init-lib" });
const test_result = try exec(dir_path, [_][]const u8{ zig_exe, "build", "test" });
- testing.expect(std.mem.eql(u8, test_result.stderr, ""));
+ testing.expect(std.mem.endsWith(u8, test_result.stderr, "All tests passed.\n"));
}
fn testZigInitExe(zig_exe: []const u8, dir_path: []const u8) !void {