mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 13:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

std.Build.Step.Run: many enhancements

Browse source 
This is a major refactor to `Step.Run` which adds new functionality,
primarily to the execution of Zig tests.

* All tests are run, even if a test crashes. This happens through the
  same mechanism as timeouts where the test processes is repeatedly
  respawned as needed.
* The build status output is more precise. For each unit test, it
  differentiates pass, skip, fail, crash, and timeout. Memory leaks are
  reported separately, as they do not indicate a test's "status", but
  are rather an additional property (a test with leaks may still pass!).
* The number of memory leaks is tracked and reported, both per-test and
  for a whole `Run` step.
* Reporting is made clearer when a step is failed solely due to error
  logs (`std.log.err`) where every unit test passed.
This commit is contained in:
mlugg 2025-08-26 15:34:53 +01:00 • committed by Matthew Lugg
parent 7e7d7875b9
commit e4456d03f3
No known key found for this signature in database
GPG key ID: 3F5B7DCCBF4AF02E
6 changed files with 476 additions and 367 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
lib/compiler/build_runner.zig
View file

@ -735,11 +735,12 @@ fn runStepNames(
assert(run.memory_blocked_steps.items.len == 0); assert(run.memory_blocked_steps.items.len == 0);
var test_pass_count: usize = 0;
var test_skip_count: usize = 0; var test_skip_count: usize = 0;
var test_fail_count: usize = 0; var test_fail_count: usize = 0;
var test_pass_count: usize = 0; var test_crash_count: usize = 0;
var test_leak_count: usize = 0;
var test_timeout_count: usize = 0; var test_timeout_count: usize = 0;
var test_count: usize = 0; var test_count: usize = 0;
var success_count: usize = 0; var success_count: usize = 0;
@ -749,11 +750,12 @@ fn runStepNames(
var total_compile_errors: usize = 0; var total_compile_errors: usize = 0;
for (step_stack.keys()) |s| { for (step_stack.keys()) |s| {
test_fail_count += s.test_results.fail_count;
test_skip_count += s.test_results.skip_count;
test_leak_count += s.test_results.leak_count;
test_timeout_count += s.test_results.timeout_count;
test_pass_count += s.test_results.passCount(); test_pass_count += s.test_results.passCount();
test_skip_count += s.test_results.skip_count;
test_fail_count += s.test_results.fail_count;
test_crash_count += s.test_results.crash_count;
test_timeout_count += s.test_results.timeout_count;
test_count += s.test_results.test_count; test_count += s.test_results.test_count;
switch (s.state) { switch (s.state) {
@ -822,6 +824,9 @@ fn runStepNames(
f.waitAndPrintReport(); f.waitAndPrintReport();
} }
// Every test has a state
assert(test_pass_count + test_skip_count + test_fail_count + test_crash_count + test_timeout_count == test_count);
// A proper command line application defaults to silently succeeding. // A proper command line application defaults to silently succeeding.
// The user may request verbose mode if they have a different preference. // The user may request verbose mode if they have a different preference.
const failures_only = switch (run.summary) { const failures_only = switch (run.summary) {
@ -844,14 +849,16 @@ fn runStepNames(
w.writeAll("\nBuild Summary:") catch {}; w.writeAll("\nBuild Summary:") catch {};
ttyconf.setColor(w, .reset) catch {}; ttyconf.setColor(w, .reset) catch {};
w.print(" {d}/{d} steps succeeded", .{ success_count, total_count }) catch {}; w.print(" {d}/{d} steps succeeded", .{ success_count, total_count }) catch {};
if (skipped_count > 0) w.print("; {d} skipped", .{skipped_count}) catch {}; if (skipped_count > 0) w.print(", {d} skipped", .{skipped_count}) catch {};
if (failure_count > 0) w.print("; {d} failed", .{failure_count}) catch {}; if (failure_count > 0) w.print(", {d} failed", .{failure_count}) catch {};
if (test_count > 0) w.print("; {d}/{d} tests passed", .{ test_pass_count, test_count }) catch {}; if (test_count > 0) {
if (test_skip_count > 0) w.print("; {d} skipped", .{test_skip_count}) catch {}; w.print("; {d}/{d} tests passed", .{ test_pass_count, test_count }) catch {};
if (test_fail_count > 0) w.print("; {d} failed", .{test_fail_count}) catch {}; if (test_skip_count > 0) w.print(", {d} skipped", .{test_skip_count}) catch {};
if (test_leak_count > 0) w.print("; {d} leaked", .{test_leak_count}) catch {}; if (test_fail_count > 0) w.print(", {d} failed", .{test_fail_count}) catch {};
if (test_timeout_count > 0) w.print("; {d} timed out", .{test_timeout_count}) catch {}; if (test_crash_count > 0) w.print(", {d} crashed", .{test_crash_count}) catch {};
if (test_timeout_count > 0) w.print(", {d} timed out", .{test_timeout_count}) catch {};
}
w.writeAll("\n") catch {}; w.writeAll("\n") catch {};
@ -961,11 +968,16 @@ fn printStepStatus(
try stderr.writeAll(" cached"); try stderr.writeAll(" cached");
} else if (s.test_results.test_count > 0) { } else if (s.test_results.test_count > 0) {
const pass_count = s.test_results.passCount(); const pass_count = s.test_results.passCount();
assert(s.test_results.test_count == pass_count + s.test_results.skip_count);
try stderr.print(" {d} passed", .{pass_count}); try stderr.print(" {d} passed", .{pass_count});
if (s.test_results.skip_count > 0) { if (s.test_results.skip_count > 0) {
try ttyconf.setColor(stderr, .white);
try stderr.writeAll(", ");
try ttyconf.setColor(stderr, .yellow); try ttyconf.setColor(stderr, .yellow);
try stderr.print(" {d} skipped", .{s.test_results.skip_count}); try stderr.print("{d} skipped", .{s.test_results.skip_count});
} }
try ttyconf.setColor(stderr, .white);
try stderr.print(" ({d} total)", .{s.test_results.test_count});
} else { } else {
try stderr.writeAll(" success"); try stderr.writeAll(" success");
} }
@ -1031,41 +1043,64 @@ fn printStepFailure(
s.result_error_bundle.errorMessageCount(), s.result_error_bundle.errorMessageCount(),
}); });
} else if (!s.test_results.isSuccess()) { } else if (!s.test_results.isSuccess()) {
try stderr.print(" {d}/{d} passed", .{ // These first values include all of the test "statuses". Every test is either passsed,
s.test_results.passCount(), s.test_results.test_count, // skipped, failed, crashed, or timed out.
}); try ttyconf.setColor(stderr, .green);
if (s.test_results.fail_count > 0) { try stderr.print(" {d} passed", .{s.test_results.passCount()});
try stderr.writeAll(", "); try ttyconf.setColor(stderr, .white);
try ttyconf.setColor(stderr, .red);
try stderr.print("{d} failed", .{
s.test_results.fail_count,
});
try ttyconf.setColor(stderr, .white);
}
if (s.test_results.skip_count > 0) { if (s.test_results.skip_count > 0) {
try stderr.writeAll(", "); try stderr.writeAll(", ");
try ttyconf.setColor(stderr, .yellow); try ttyconf.setColor(stderr, .yellow);
try stderr.print("{d} skipped", .{ try stderr.print("{d} skipped", .{s.test_results.skip_count});
s.test_results.skip_count,
});
try ttyconf.setColor(stderr, .white); try ttyconf.setColor(stderr, .white);
} }
if (s.test_results.leak_count > 0) { if (s.test_results.fail_count > 0) {
try stderr.writeAll(", "); try stderr.writeAll(", ");
try ttyconf.setColor(stderr, .red); try ttyconf.setColor(stderr, .red);
try stderr.print("{d} leaked", .{ try stderr.print("{d} failed", .{s.test_results.fail_count});
s.test_results.leak_count, try ttyconf.setColor(stderr, .white);
}); }
if (s.test_results.crash_count > 0) {
try stderr.writeAll(", ");
try ttyconf.setColor(stderr, .red);
try stderr.print("{d} crashed", .{s.test_results.crash_count});
try ttyconf.setColor(stderr, .white); try ttyconf.setColor(stderr, .white);
} }
if (s.test_results.timeout_count > 0) { if (s.test_results.timeout_count > 0) {
try stderr.writeAll(", "); try stderr.writeAll(", ");
try ttyconf.setColor(stderr, .red); try ttyconf.setColor(stderr, .red);
try stderr.print("{d} timed out", .{ try stderr.print("{d} timed out", .{s.test_results.timeout_count});
s.test_results.timeout_count,
});
try ttyconf.setColor(stderr, .white); try ttyconf.setColor(stderr, .white);
} }
try stderr.print(" ({d} total)", .{s.test_results.test_count});
// Memory leaks are intentionally written after the total, because is isn't a test *status*,
// but just a flag that any tests -- even passed ones -- can have. We also use a different
// separator, so it looks like:
// 2 passed, 1 skipped, 2 failed (5 total); 2 leaks
if (s.test_results.leak_count > 0) {
try stderr.writeAll("; ");
try ttyconf.setColor(stderr, .red);
try stderr.print("{d} leaks", .{s.test_results.leak_count});
try ttyconf.setColor(stderr, .white);
}
// It's usually not helpful to know how many error logs there were because they tend to
// just come with other errors (e.g. crashes and leaks print stack traces, and clean
// failures print error traces). So only mention them if they're the only thing causing
// the failure.
const show_err_logs: bool = show: {
var alt_results = s.test_results;
alt_results.log_err_count = 0;
break :show alt_results.isSuccess();
};
if (show_err_logs) {
try stderr.writeAll("; ");
try ttyconf.setColor(stderr, .red);
try stderr.print("{d} error logs", .{s.test_results.log_err_count});
try ttyconf.setColor(stderr, .white);
}
try stderr.writeAll("\n"); try stderr.writeAll("\n");
} else if (s.result_error_msgs.items.len > 0) { } else if (s.result_error_msgs.items.len > 0) {
try ttyconf.setColor(stderr, .red); try ttyconf.setColor(stderr, .red);
@ -1400,7 +1435,12 @@ pub fn printErrorMessages(
try ttyconf.setColor(stderr, .red); try ttyconf.setColor(stderr, .red);
try stderr.writeAll("error: "); try stderr.writeAll("error: ");
try ttyconf.setColor(stderr, .reset); try ttyconf.setColor(stderr, .reset);
try stderr.writeAll(msg); // If the message has multiple lines, indent the non-initial ones to align them with the 'error:' text.
var it = std.mem.splitScalar(u8, msg, '\n');
try stderr.writeAll(it.first());
while (it.next()) |line| {
try stderr.print("\n {s}", .{line});
}
try stderr.writeAll("\n"); try stderr.writeAll("\n");
} }
} }

27
lib/compiler/test_runner.zig
View file

@ -132,34 +132,39 @@ fn mainServer() !void {
log_err_count = 0; log_err_count = 0;
const index = try server.receiveBody_u32(); const index = try server.receiveBody_u32();
const test_fn = builtin.test_functions[index]; const test_fn = builtin.test_functions[index];
var fail = false;
var skip = false;
is_fuzz_test = false; is_fuzz_test = false;
// let the build server know we're starting the test now // let the build server know we're starting the test now
try server.serveStringMessage(.test_started, &.{}); try server.serveStringMessage(.test_started, &.{});
test_fn.func() catch |err| switch (err) { const TestResults = std.zig.Server.Message.TestResults;
error.SkipZigTest => skip = true, const status: TestResults.Status = if (test_fn.func()) |v| s: {
else => { v;
fail = true; break :s .pass;
} else |err| switch (err) {
error.SkipZigTest => .skip,
else => s: {
if (@errorReturnTrace()) |trace| { if (@errorReturnTrace()) |trace| {
std.debug.dumpStackTrace(trace); std.debug.dumpStackTrace(trace);
} }
break :s .fail;
}, },
}; };
const leak = testing.allocator_instance.deinit() == .leak; const leak_count = testing.allocator_instance.detectLeaks();
testing.allocator_instance.deinitWithoutLeakChecks();
try server.serveTestResults(.{ try server.serveTestResults(.{
.index = index, .index = index,
.flags = .{ .flags = .{
.fail = fail, .status = status,
.skip = skip,
.leak = leak,
.fuzz = is_fuzz_test, .fuzz = is_fuzz_test,
.log_err_count = std.math.lossyCast( .log_err_count = std.math.lossyCast(
@FieldType(std.zig.Server.Message.TestResults.Flags, "log_err_count"), @FieldType(TestResults.Flags, "log_err_count"),
log_err_count, log_err_count,
), ),
.leak_count = std.math.lossyCast(
@FieldType(TestResults.Flags, "leak_count"),
leak_count,
),
}, },
}); });
}, },

38
lib/std/Build/Step.zig
View file

@ -63,19 +63,43 @@ test_results: TestResults,
debug_stack_trace: std.builtin.StackTrace, debug_stack_trace: std.builtin.StackTrace,
pub const TestResults = struct { pub const TestResults = struct {
fail_count: u32 = 0, /// The total number of tests in the step. Every test has a "status" from the following:
skip_count: u32 = 0, /// * passed
leak_count: u32 = 0, /// * skipped
timeout_count: u32 = 0, /// * failed cleanly
log_err_count: u32 = 0, /// * crashed
/// * timed out
test_count: u32 = 0, test_count: u32 = 0,
/// The number of tests which were skipped (`error.SkipZigTest`).
skip_count: u32 = 0,
/// The number of tests which failed cleanly.
fail_count: u32 = 0,
/// The number of tests which terminated unexpectedly, i.e. crashed.
crash_count: u32 = 0,
/// The number of tests which timed out.
timeout_count: u32 = 0,
/// The number of detected memory leaks. The associated test may still have passed; indeed, *all*
/// individual tests may have passed. However, the step as a whole fails if any test has leaks.
leak_count: u32 = 0,
/// The number of detected error logs. The associated test may still have passed; indeed, *all*
/// individual tests may have passed. However, the step as a whole fails if any test logs errors.
log_err_count: u32 = 0,
pub fn isSuccess(tr: TestResults) bool { pub fn isSuccess(tr: TestResults) bool {
return tr.fail_count == 0 and tr.leak_count == 0 and tr.log_err_count == 0 and tr.timeout_count == 0; // all steps are success or skip
return tr.fail_count == 0 and
tr.crash_count == 0 and
tr.timeout_count == 0 and
// no (otherwise successful) step leaked memory or logged errors
tr.leak_count == 0 and
tr.log_err_count == 0;
} }
/// Computes the number of tests which passed from the other values.
pub fn passCount(tr: TestResults) u32 { pub fn passCount(tr: TestResults) u32 {
return tr.test_count - tr.fail_count - tr.skip_count - tr.timeout_count; return tr.test_count - tr.skip_count - tr.fail_count - tr.crash_count - tr.timeout_count;
} }
}; };

627
lib/std/Build/Step/Run.zig
View file

@ -630,6 +630,8 @@ pub fn addCheck(run: *Run, new_check: StdIo.Check) void {
pub fn captureStdErr(run: *Run, options: CapturedStdIo.Options) std.Build.LazyPath { pub fn captureStdErr(run: *Run, options: CapturedStdIo.Options) std.Build.LazyPath {
assert(run.stdio != .inherit); assert(run.stdio != .inherit);
assert(run.stdio != .zig_test);
const b = run.step.owner; const b = run.step.owner;
if (run.captured_stderr) |captured| return .{ .generated = .{ .file = &captured.output.generated_file } }; if (run.captured_stderr) |captured| return .{ .generated = .{ .file = &captured.output.generated_file } };
@ -649,6 +651,8 @@ pub fn captureStdErr(run: *Run, options: CapturedStdIo.Options) std.Build.LazyPa
pub fn captureStdOut(run: *Run, options: CapturedStdIo.Options) std.Build.LazyPath { pub fn captureStdOut(run: *Run, options: CapturedStdIo.Options) std.Build.LazyPath {
assert(run.stdio != .inherit); assert(run.stdio != .inherit);
assert(run.stdio != .zig_test);
const b = run.step.owner; const b = run.step.owner;
if (run.captured_stdout) |captured| return .{ .generated = .{ .file = &captured.output.generated_file } }; if (run.captured_stdout) |captured| return .{ .generated = .{ .file = &captured.output.generated_file } };
@ -1224,7 +1228,7 @@ fn runCommand(
var env_map = run.env_map orelse &b.graph.env_map; var env_map = run.env_map orelse &b.graph.env_map;
const result = spawnChildAndCollect(run, argv, env_map, has_side_effects, options, fuzz_context) catch |err| term: { const opt_generic_result = spawnChildAndCollect(run, argv, env_map, has_side_effects, options, fuzz_context) catch |err| term: {
// InvalidExe: cpu arch mismatch // InvalidExe: cpu arch mismatch
// FileNotFound: can happen with a wrong dynamic linker path // FileNotFound: can happen with a wrong dynamic linker path
if (err == error.InvalidExe or err == error.FileNotFound) interpret: { if (err == error.InvalidExe or err == error.FileNotFound) interpret: {
@ -1365,34 +1369,34 @@ fn runCommand(
break :term spawnChildAndCollect(run, interp_argv.items, env_map, has_side_effects, options, fuzz_context) catch |e| { break :term spawnChildAndCollect(run, interp_argv.items, env_map, has_side_effects, options, fuzz_context) catch |e| {
if (!run.failing_to_execute_foreign_is_an_error) return error.MakeSkipped; if (!run.failing_to_execute_foreign_is_an_error) return error.MakeSkipped;
if (e == error.MakeFailed) return error.MakeFailed; // error already reported
return step.fail("unable to spawn interpreter {s}: {s}", .{ return step.fail("unable to spawn interpreter {s}: {s}", .{
interp_argv.items[0], @errorName(e), interp_argv.items[0], @errorName(e),
}); });
}; };
} }
if (err == error.MakeFailed) return error.MakeFailed; // error already reported
return step.fail("failed to spawn and capture stdio from {s}: {s}", .{ argv[0], @errorName(err) }); return step.fail("failed to spawn and capture stdio from {s}: {s}", .{ argv[0], @errorName(err) });
}; };
step.result_duration_ns = result.elapsed_ns;
step.result_peak_rss = result.peak_rss;
step.test_results = result.stdio.test_results;
if (result.stdio.test_metadata) |tm| {
run.cached_test_metadata = tm.toCachedTestMetadata();
if (options.web_server) |ws| ws.updateTimeReportRunTest(
run,
&run.cached_test_metadata.?,
tm.ns_per_test,
);
}
const final_argv = if (interp_argv.items.len == 0) argv else interp_argv.items; const final_argv = if (interp_argv.items.len == 0) argv else interp_argv.items;
if (fuzz_context != null) { const generic_result = opt_generic_result orelse {
try step.handleChildProcessTerm(result.term, cwd, final_argv); assert(run.stdio == .zig_test);
// Specific errors have already been reported. All we need to do is detect those and
// report the general "test failed" error, which includes the command argv.
if (!step.test_results.isSuccess() or step.result_error_msgs.items.len > 0) {
return step.fail(
"the following test command failed:\n{s}",
.{try Step.allocPrintCmd(arena, cwd, final_argv)},
);
}
return; return;
} };
assert(fuzz_context == null);
assert(run.stdio != .zig_test);
// Capture stdout and stderr to GeneratedFile objects. // Capture stdout and stderr to GeneratedFile objects.
const Stream = struct { const Stream = struct {
@ -1402,11 +1406,11 @@ fn runCommand(
for ([_]Stream{ for ([_]Stream{
.{ .{
.captured = run.captured_stdout, .captured = run.captured_stdout,
.bytes = result.stdio.stdout, .bytes = generic_result.stdout,
}, },
.{ .{
.captured = run.captured_stderr, .captured = run.captured_stderr,
.bytes = result.stdio.stderr, .bytes = generic_result.stderr,
}, },
}) |stream| { }) |stream| {
if (stream.captured) |captured| { if (stream.captured) |captured| {
@ -1436,9 +1440,10 @@ fn runCommand(
} }
switch (run.stdio) { switch (run.stdio) {
.zig_test => unreachable,
.check => |checks| for (checks.items) |check| switch (check) { .check => |checks| for (checks.items) |check| switch (check) {
.expect_stderr_exact => |expected_bytes| { .expect_stderr_exact => |expected_bytes| {
if (!mem.eql(u8, expected_bytes, result.stdio.stderr.?)) { if (!mem.eql(u8, expected_bytes, generic_result.stderr.?)) {
return step.fail( return step.fail(
\\ \\
\\========= expected this stderr: ========= \\========= expected this stderr: =========
@ -1449,13 +1454,13 @@ fn runCommand(
\\{s} \\{s}
, .{ , .{
expected_bytes, expected_bytes,
result.stdio.stderr.?, generic_result.stderr.?,
try Step.allocPrintCmd(arena, cwd, final_argv), try Step.allocPrintCmd(arena, cwd, final_argv),
}); });
} }
}, },
.expect_stderr_match => |match| { .expect_stderr_match => |match| {
if (mem.indexOf(u8, result.stdio.stderr.?, match) == null) { if (mem.indexOf(u8, generic_result.stderr.?, match) == null) {
return step.fail( return step.fail(
\\ \\
\\========= expected to find in stderr: ========= \\========= expected to find in stderr: =========
@ -1466,13 +1471,13 @@ fn runCommand(
\\{s} \\{s}
, .{ , .{
match, match,
result.stdio.stderr.?, generic_result.stderr.?,
try Step.allocPrintCmd(arena, cwd, final_argv), try Step.allocPrintCmd(arena, cwd, final_argv),
}); });
} }
}, },
.expect_stdout_exact => |expected_bytes| { .expect_stdout_exact => |expected_bytes| {
if (!mem.eql(u8, expected_bytes, result.stdio.stdout.?)) { if (!mem.eql(u8, expected_bytes, generic_result.stdout.?)) {
return step.fail( return step.fail(
\\ \\
\\========= expected this stdout: ========= \\========= expected this stdout: =========
@ -1483,13 +1488,13 @@ fn runCommand(
\\{s} \\{s}
, .{ , .{
expected_bytes, expected_bytes,
result.stdio.stdout.?, generic_result.stdout.?,
try Step.allocPrintCmd(arena, cwd, final_argv), try Step.allocPrintCmd(arena, cwd, final_argv),
}); });
} }
}, },
.expect_stdout_match => |match| { .expect_stdout_match => |match| {
if (mem.indexOf(u8, result.stdio.stdout.?, match) == null) { if (mem.indexOf(u8, generic_result.stdout.?, match) == null) {
return step.fail( return step.fail(
\\ \\
\\========= expected to find in stdout: ========= \\========= expected to find in stdout: =========
@ -1500,69 +1505,45 @@ fn runCommand(
\\{s} \\{s}
, .{ , .{
match, match,
result.stdio.stdout.?, generic_result.stdout.?,
try Step.allocPrintCmd(arena, cwd, final_argv), try Step.allocPrintCmd(arena, cwd, final_argv),
}); });
} }
}, },
.expect_term => |expected_term| { .expect_term => |expected_term| {
if (!termMatches(expected_term, result.term)) { if (!termMatches(expected_term, generic_result.term)) {
return step.fail("the following command {f} (expected {f}):\n{s}", .{ return step.fail("the following command {f} (expected {f}):\n{s}", .{
fmtTerm(result.term), fmtTerm(generic_result.term),
fmtTerm(expected_term), fmtTerm(expected_term),
try Step.allocPrintCmd(arena, cwd, final_argv), try Step.allocPrintCmd(arena, cwd, final_argv),
}); });
} }
}, },
}, },
.zig_test => {
const prefix: []const u8 = p: {
if (result.stdio.test_metadata) |tm| {
if (tm.next_index > 0 and tm.next_index <= tm.names.len) {
const name = tm.testName(tm.next_index - 1);
break :p b.fmt("while executing test '{s}', ", .{name});
}
}
break :p "";
};
const expected_term: std.process.Child.Term = .{ .Exited = 0 };
if (!termMatches(expected_term, result.term)) {
return step.fail("{s}the following command {f} (expected {f}):\n{s}", .{
prefix,
fmtTerm(result.term),
fmtTerm(expected_term),
try Step.allocPrintCmd(arena, cwd, final_argv),
});
}
if (!result.stdio.test_results.isSuccess()) {
return step.fail(
"{s}the following test command failed:\n{s}",
.{ prefix, try Step.allocPrintCmd(arena, cwd, final_argv) },
);
}
},
else => { else => {
// On failure, print stderr if captured. // On failure, print stderr if captured.
const bad_exit = switch (result.term) { const bad_exit = switch (generic_result.term) {
.Exited => |code| code != 0, .Exited => |code| code != 0,
.Signal, .Stopped, .Unknown => true, .Signal, .Stopped, .Unknown => true,
}; };
if (bad_exit) if (result.stdio.stderr) |err| { if (bad_exit) if (generic_result.stderr) |err| {
try step.addError("stderr:\n{s}", .{err}); try step.addError("stderr:\n{s}", .{err});
}; };
try step.handleChildProcessTerm(result.term, cwd, final_argv); try step.handleChildProcessTerm(generic_result.term, cwd, final_argv);
}, },
} }
} }
const ChildProcResult = struct { const EvalZigTestResult = struct {
test_results: Step.TestResults,
test_metadata: ?TestMetadata,
};
const EvalGenericResult = struct {
term: std.process.Child.Term, term: std.process.Child.Term,
elapsed_ns: u64, stdout: ?[]const u8,
peak_rss: usize, stderr: ?[]const u8,
stdio: StdIoResult,
}; };
fn spawnChildAndCollect( fn spawnChildAndCollect(
@ -1572,7 +1553,7 @@ fn spawnChildAndCollect(
has_side_effects: bool, has_side_effects: bool,
options: Step.MakeOptions, options: Step.MakeOptions,
fuzz_context: ?FuzzContext, fuzz_context: ?FuzzContext,
) !ChildProcResult { ) !?EvalGenericResult {
const b = run.step.owner; const b = run.step.owner;
const arena = b.allocator; const arena = b.allocator;
@ -1613,134 +1594,248 @@ fn spawnChildAndCollect(
child.stdin_behavior = .Pipe; child.stdin_behavior = .Pipe;
} }
const inherit = child.stdout_behavior == .Inherit or child.stderr_behavior == .Inherit; if (run.stdio == .zig_test) {
var timer = try std.time.Timer.start();
if (run.stdio != .zig_test and !run.disable_zig_progress and !inherit) { const res = try evalZigTest(run, &child, options, fuzz_context);
child.progress_node = options.progress_node; run.step.result_duration_ns = timer.read();
} run.step.test_results = res.test_results;
if (res.test_metadata) |tm| {
const term, const result, const elapsed_ns = t: { run.cached_test_metadata = tm.toCachedTestMetadata();
if (options.web_server) |ws| ws.updateTimeReportRunTest(
run,
&run.cached_test_metadata.?,
tm.ns_per_test,
);
}
return null;
} else {
const inherit = child.stdout_behavior == .Inherit or child.stderr_behavior == .Inherit;
if (!run.disable_zig_progress and !inherit) {
child.progress_node = options.progress_node;
}
if (inherit) std.debug.lockStdErr(); if (inherit) std.debug.lockStdErr();
defer if (inherit) std.debug.unlockStdErr(); defer if (inherit) std.debug.unlockStdErr();
try child.spawn();
errdefer {
_ = child.kill() catch {};
}
// We need to report `error.InvalidExe` *now* if applicable.
try child.waitForSpawn();
var timer = try std.time.Timer.start(); var timer = try std.time.Timer.start();
const res = try evalGeneric(run, &child);
const result = if (run.stdio == .zig_test) run.step.result_duration_ns = timer.read();
try evalZigTest(run, &child, options, fuzz_context) return .{ .term = res.term, .stdout = res.stdout, .stderr = res.stderr };
else }
try evalGeneric(run, &child);
break :t .{ try child.wait(), result, timer.read() };
};
return .{
.stdio = result,
.term = term,
.elapsed_ns = elapsed_ns,
.peak_rss = child.resource_usage_statistics.getMaxRss() orelse 0,
};
} }
const StdIoResult = struct { const StdioPollEnum = enum { stdout, stderr };
stdout: ?[]const u8,
stderr: ?[]const u8,
test_results: Step.TestResults,
test_metadata: ?TestMetadata,
};
fn evalZigTest( fn evalZigTest(
run: *Run, run: *Run,
child: *std.process.Child, child: *std.process.Child,
options: Step.MakeOptions, options: Step.MakeOptions,
fuzz_context: ?FuzzContext, fuzz_context: ?FuzzContext,
) !StdIoResult { ) !EvalZigTestResult {
const gpa = run.step.owner.allocator; const gpa = run.step.owner.allocator;
const arena = run.step.owner.allocator; const arena = run.step.owner.allocator;
const PollEnum = enum { stdout, stderr }; // We will update this every time a child runs.
run.step.result_peak_rss = 0;
var poller = std.Io.poll(gpa, PollEnum, .{ var result: EvalZigTestResult = .{
.stdout = child.stdout.?, .test_results = .{
.stderr = child.stderr.?, .test_count = 0,
}); .skip_count = 0,
defer poller.deinit(); .fail_count = 0,
.crash_count = 0,
.timeout_count = 0,
.leak_count = 0,
.log_err_count = 0,
},
.test_metadata = null,
};
// If this is `true`, we avoid ever entering the polling loop below, because the stdin pipe has while (true) {
// somehow already closed; instead, we go straight to capturing stderr in case it has anything try child.spawn();
// useful. var poller = std.Io.poll(gpa, StdioPollEnum, .{
const first_write_failed = if (fuzz_context) |fctx| failed: { .stdout = child.stdout.?,
switch (fctx.fuzz.mode) { .stderr = child.stderr.?,
.forever => { });
const instance_id = 0; // will be used by mutiprocess forever fuzzing var child_killed = false;
sendRunFuzzTestMessage(child.stdin.?, fctx.unit_test_index, .forever, instance_id) catch |err| { defer if (!child_killed) {
try run.step.addError("unable to write stdin: {s}", .{@errorName(err)}); _ = child.kill() catch {};
break :failed true; poller.deinit();
}; run.step.result_peak_rss = @max(
break :failed false; run.step.result_peak_rss,
child.resource_usage_statistics.getMaxRss() orelse 0,
);
};
try child.waitForSpawn();
switch (try pollZigTest(
run,
child,
options,
fuzz_context,
&poller,
&result.test_metadata,
&result.test_results,
)) {
.write_failed => |err| {
// The runner unexpectedly closed a stdio pipe, which means a crash. Make sure we've captured
// all available stderr to make our error output as useful as possible.
while (try poller.poll()) {}
run.step.result_stderr = try arena.dupe(u8, poller.reader(.stderr).buffered());
// Clean up everything and wait for the child to exit.
child.stdin.?.close();
child.stdin = null;
poller.deinit();
child_killed = true;
const term = try child.wait();
run.step.result_peak_rss = @max(
run.step.result_peak_rss,
child.resource_usage_statistics.getMaxRss() orelse 0,
);
try run.step.addError("unable to write stdin ({t}); test process unexpectedly {f}", .{ err, fmtTerm(term) });
return result;
}, },
.limit => |limit| { .no_poll => |no_poll| {
sendRunFuzzTestMessage(child.stdin.?, fctx.unit_test_index, .iterations, limit.amount) catch |err| { // This might be a success (we requested exit and the child dutifully closed stdout) or
try run.step.addError("unable to write stdin: {s}", .{@errorName(err)}); // a crash of some kind. Either way, the child will terminate by itself -- wait for it.
break :failed true; const stderr_owned = try arena.dupe(u8, poller.reader(.stderr).buffered());
}; poller.reader(.stderr).tossBuffered();
break :failed false;
// Clean up everything and wait for the child to exit.
child.stdin.?.close();
child.stdin = null;
poller.deinit();
child_killed = true;
const term = try child.wait();
run.step.result_peak_rss = @max(
run.step.result_peak_rss,
child.resource_usage_statistics.getMaxRss() orelse 0,
);
if (no_poll.active_test_index) |test_index| {
// A test was running, so this is definitely a crash. Report it against that
// test, and continue to the next test.
result.test_metadata.?.ns_per_test[test_index] = no_poll.ns_elapsed;
result.test_results.crash_count += 1;
try run.step.addError("'{s}' {f}{s}{s}", .{
result.test_metadata.?.testName(test_index),
fmtTerm(term),
if (stderr_owned.len != 0) " with stderr:\n" else "",
std.mem.trim(u8, stderr_owned, "\n"),
});
continue;
}
// Report an error if the child terminated uncleanly or if we were still trying to run more tests.
run.step.result_stderr = stderr_owned;
const tests_done = result.test_metadata != null and result.test_metadata.?.next_index == std.math.maxInt(u32);
if (!tests_done or !termMatches(.{ .Exited = 0 }, term)) {
try run.step.addError("test process unexpectedly {f}", .{fmtTerm(term)});
}
return result;
},
.timeout => |timeout| {
const stderr = poller.reader(.stderr).buffered();
poller.reader(.stderr).tossBuffered();
if (timeout.active_test_index) |test_index| {
// A test was running. Report the timeout against that test, and continue on to
// the next test.
result.test_metadata.?.ns_per_test[test_index] = timeout.ns_elapsed;
result.test_results.timeout_count += 1;
try run.step.addError("'{s}' timed out after {D}{s}{s}", .{
result.test_metadata.?.testName(test_index),
timeout.ns_elapsed,
if (stderr.len != 0) " with stderr:\n" else "",
std.mem.trim(u8, stderr, "\n"),
});
continue;
}
// Just log an error and let the child be killed.
run.step.result_stderr = try arena.dupe(u8, stderr);
return run.step.fail("test runner failed to respond for {D}", .{timeout.ns_elapsed});
}, },
} }
} else failed: { comptime unreachable;
run.fuzz_tests.clearRetainingCapacity(); }
sendMessage(child.stdin.?, .query_test_metadata) catch |err| { }
try run.step.addError("unable to write stdin: {s}", .{@errorName(err)});
break :failed true;
};
break :failed false;
};
var fail_count: u32 = 0; /// Polls stdout of a Zig test process until a termination condition is reached:
var skip_count: u32 = 0; /// * A write fails, indicating the child unexpectedly closed stdin
var leak_count: u32 = 0; /// * A test (or a response from the test runner) times out
var timeout_count: u32 = 0; /// * `poll` fails, indicating the child closed stdout and stderr
var test_count: u32 = 0; fn pollZigTest(
var log_err_count: u32 = 0; run: *Run,
child: *std.process.Child,
var metadata: ?TestMetadata = null; options: Step.MakeOptions,
var coverage_id: ?u64 = null; fuzz_context: ?FuzzContext,
poller: *std.Io.Poller(StdioPollEnum),
var test_is_running = false; opt_metadata: *?TestMetadata,
results: *Step.TestResults,
// String allocated into `gpa`. Owned by this function while it runs, then moved to the `Step`. ) !union(enum) {
var result_stderr: []u8 = &.{}; write_failed: anyerror,
defer run.step.result_stderr = result_stderr; no_poll: struct {
active_test_index: ?u32,
// `null` means this host does not support `std.time.Timer`. This timer is `reset()` whenever we ns_elapsed: u64,
// toggle `test_is_running`, i.e. whenever a test starts or finishes. },
var timer: ?std.time.Timer = std.time.Timer.start() catch t: { timeout: struct {
std.log.warn("std.time.Timer not supported on host; test timeouts will be ignored", .{}); active_test_index: ?u32,
break :t null; ns_elapsed: u64,
}; },
} {
const gpa = run.step.owner.allocator;
const arena = run.step.owner.allocator;
var sub_prog_node: ?std.Progress.Node = null; var sub_prog_node: ?std.Progress.Node = null;
defer if (sub_prog_node) |n| n.end(); defer if (sub_prog_node) |n| n.end();
if (fuzz_context) |ctx| {
assert(opt_metadata.* == null); // fuzz processes are never restarted
switch (ctx.fuzz.mode) {
.forever => {
sendRunFuzzTestMessage(
child.stdin.?,
ctx.unit_test_index,
.forever,
0, // instance ID; will be used by multiprocess forever fuzzing in the future
) catch |err| return .{ .write_failed = err };
},
.limit => |limit| {
sendRunFuzzTestMessage(
child.stdin.?,
ctx.unit_test_index,
.iterations,
limit.amount,
) catch |err| return .{ .write_failed = err };
},
}
} else if (opt_metadata.*) |*md| {
// Previous unit test process died or was killed; we're continuing where it left off
requestNextTest(child.stdin.?, md, &sub_prog_node) catch |err| return .{ .write_failed = err };
} else {
// Running unit tests normally
run.fuzz_tests.clearRetainingCapacity();
sendMessage(child.stdin.?, .query_test_metadata) catch |err| return .{ .write_failed = err };
}
var active_test_index: ?u32 = null;
// `null` means this host does not support `std.time.Timer`. This timer is `reset()` whenever we
// change `active_test_index`, i.e. whenever a test starts or finishes.
var timer: ?std.time.Timer = std.time.Timer.start() catch null;
var coverage_id: ?u64 = null;
// This timeout is used when we're waiting on the test runner itself rather than a user-specified // This timeout is used when we're waiting on the test runner itself rather than a user-specified
// test. For instance, if the test runner leaves this much time between us requesting a test to // test. For instance, if the test runner leaves this much time between us requesting a test to
// start and it acknowledging the test starting, we terminate the child and raise an error. This // start and it acknowledging the test starting, we terminate the child and raise an error. This
// *should* never happen, but could in theory be caused by some very unlucky IB in a test. // *should* never happen, but could in theory be caused by some very unlucky IB in a test.
const response_timeout_ns = 30 * std.time.ns_per_s; const response_timeout_ns = 30 * std.time.ns_per_s;
const any_write_failed = first_write_failed or poll: while (true) { const stdout = poller.reader(.stdout);
// These are scoped inside the loop because we sometimes respawn the child and recreate const stderr = poller.reader(.stderr);
// `poller` which invaldiates these readers.
const stdout = poller.reader(.stdout);
const stderr = poller.reader(.stderr);
while (true) {
const Header = std.zig.Server.Message.Header; const Header = std.zig.Server.Message.Header;
// This block is exited when `stdout` contains enough bytes for a `Header`. // This block is exited when `stdout` contains enough bytes for a `Header`.
@ -1753,15 +1848,21 @@ fn evalZigTest(
// Always `null` if `timer` is `null`. // Always `null` if `timer` is `null`.
const opt_timeout_ns: ?u64 = ns: { const opt_timeout_ns: ?u64 = ns: {
if (timer == null) break :ns null; if (timer == null) break :ns null;
if (!test_is_running) break :ns response_timeout_ns; if (active_test_index == null) break :ns response_timeout_ns;
break :ns options.unit_test_timeout_ns; break :ns options.unit_test_timeout_ns;
}; };
if (opt_timeout_ns) |timeout_ns| { if (opt_timeout_ns) |timeout_ns| {
const remaining_ns = timeout_ns -| timer.?.read(); const remaining_ns = timeout_ns -| timer.?.read();
if (!try poller.pollTimeout(remaining_ns)) break :poll false; if (!try poller.pollTimeout(remaining_ns)) return .{ .no_poll = .{
.active_test_index = active_test_index,
.ns_elapsed = if (timer) |*t| t.read() else 0,
} };
} else { } else {
if (!try poller.poll()) break :poll false; if (!try poller.poll()) return .{ .no_poll = .{
.active_test_index = active_test_index,
.ns_elapsed = if (timer) |*t| t.read() else 0,
} };
} }
if (stdout.buffered().len >= @sizeOf(Header)) { if (stdout.buffered().len >= @sizeOf(Header)) {
@ -1769,73 +1870,29 @@ fn evalZigTest(
break :header_ready; break :header_ready;
} }
const timeout_ns = opt_timeout_ns orelse continue; if (opt_timeout_ns) |timeout_ns| {
const cur_ns = timer.?.read(); const cur_ns = timer.?.read();
if (cur_ns < timeout_ns) continue; if (cur_ns >= timeout_ns) return .{ .timeout = .{
.active_test_index = active_test_index,
// There was a timeout. .ns_elapsed = cur_ns,
} };
if (!test_is_running) {
// The child stopped responding while *not* running a test. To avoid getting into
// a loop if something's broken, don't retry; just report an error and stop.
try run.step.addError("test runner failed to respond for {D}", .{cur_ns});
break :poll false;
} }
continue;
// A test has probably just gotten stuck. We'll report an error, then just kill the
// child and continue with the next test in the list.
const md = &metadata.?;
const test_index = md.next_index - 1;
timeout_count += 1;
try run.step.addError(
"'{s}' timed out after {D}",
.{ md.testName(test_index), cur_ns },
);
if (stderr.buffered().len > 0) {
const new_bytes = stderr.buffered();
const old_len = result_stderr.len;
result_stderr = try gpa.realloc(result_stderr, old_len + new_bytes.len);
@memcpy(result_stderr[old_len..], new_bytes);
}
_ = try child.kill();
// Respawn the test runner. There's a double-cleanup if this fails, but that's
// fine because our caller's `kill` will just return `error.AlreadyTerminated`.
try child.spawn();
try child.waitForSpawn();
// After respawning the child, we must update the poller's streams.
poller.deinit();
poller = std.Io.poll(gpa, PollEnum, .{
.stdout = child.stdout.?,
.stderr = child.stderr.?,
});
test_is_running = false;
md.ns_per_test[test_index] = timer.?.lap();
requestNextTest(child.stdin.?, md, &sub_prog_node) catch |err| {
try run.step.addError("unable to write stdin: {s}", .{@errorName(err)});
break :poll true;
};
continue :poll; // continue work with the new (respawned) child
} }
// There is definitely a header available now -- read it. // There is definitely a header available now -- read it.
const header = stdout.takeStruct(Header, .little) catch unreachable; const header = stdout.takeStruct(Header, .little) catch unreachable;
while (stdout.buffered().len < header.bytes_len) if (!try poller.poll()) break :poll false; while (stdout.buffered().len < header.bytes_len) if (!try poller.poll()) return .{ .no_poll = .{
.active_test_index = active_test_index,
.ns_elapsed = if (timer) |*t| t.read() else 0,
} };
const body = stdout.take(header.bytes_len) catch unreachable; const body = stdout.take(header.bytes_len) catch unreachable;
switch (header.tag) { switch (header.tag) {
.zig_version => { .zig_version => {
if (!std.mem.eql(u8, builtin.zig_version_string, body)) { if (!std.mem.eql(u8, builtin.zig_version_string, body)) return run.step.fail(
return run.step.fail( "zig version mismatch build runner vs compiler: '{s}' vs '{s}'",
"zig version mismatch build runner vs compiler: '{s}' vs '{s}'", .{ builtin.zig_version_string, body },
.{ builtin.zig_version_string, body }, );
);
}
}, },
.test_metadata => { .test_metadata => {
assert(fuzz_context == null); assert(fuzz_context == null);
@ -1843,14 +1900,14 @@ fn evalZigTest(
// `metadata` would only be populated if we'd already seen a `test_metadata`, but we // `metadata` would only be populated if we'd already seen a `test_metadata`, but we
// only request it once (and importantly, we don't re-request it if we kill and // only request it once (and importantly, we don't re-request it if we kill and
// restart the test runner). // restart the test runner).
assert(metadata == null); assert(opt_metadata.* == null);
const TmHdr = std.zig.Server.Message.TestMetadata; const TmHdr = std.zig.Server.Message.TestMetadata;
const tm_hdr = @as(*align(1) const TmHdr, @ptrCast(body)); const tm_hdr: *align(1) const TmHdr = @ptrCast(body);
test_count = tm_hdr.tests_len; results.test_count = tm_hdr.tests_len;
const names_bytes = body[@sizeOf(TmHdr)..][0 .. test_count * @sizeOf(u32)]; const names_bytes = body[@sizeOf(TmHdr)..][0 .. results.test_count * @sizeOf(u32)];
const expected_panic_msgs_bytes = body[@sizeOf(TmHdr) + names_bytes.len ..][0 .. test_count * @sizeOf(u32)]; const expected_panic_msgs_bytes = body[@sizeOf(TmHdr) + names_bytes.len ..][0 .. results.test_count * @sizeOf(u32)];
const string_bytes = body[@sizeOf(TmHdr) + names_bytes.len + expected_panic_msgs_bytes.len ..][0..tm_hdr.string_bytes_len]; const string_bytes = body[@sizeOf(TmHdr) + names_bytes.len + expected_panic_msgs_bytes.len ..][0..tm_hdr.string_bytes_len];
const names = std.mem.bytesAsSlice(u32, names_bytes); const names = std.mem.bytesAsSlice(u32, names_bytes);
@ -1863,68 +1920,70 @@ fn evalZigTest(
for (expected_panic_msgs_aligned, expected_panic_msgs) |*dest, src| dest.* = src; for (expected_panic_msgs_aligned, expected_panic_msgs) |*dest, src| dest.* = src;
options.progress_node.setEstimatedTotalItems(names.len); options.progress_node.setEstimatedTotalItems(names.len);
metadata = .{ opt_metadata.* = .{
.string_bytes = try arena.dupe(u8, string_bytes), .string_bytes = try arena.dupe(u8, string_bytes),
.ns_per_test = try arena.alloc(u64, test_count), .ns_per_test = try arena.alloc(u64, results.test_count),
.names = names_aligned, .names = names_aligned,
.expected_panic_msgs = expected_panic_msgs_aligned, .expected_panic_msgs = expected_panic_msgs_aligned,
.next_index = 0, .next_index = 0,
.prog_node = options.progress_node, .prog_node = options.progress_node,
}; };
@memset(metadata.?.ns_per_test, std.math.maxInt(u64)); @memset(opt_metadata.*.?.ns_per_test, std.math.maxInt(u64));
test_is_running = false; active_test_index = null;
if (timer) |*t| t.reset(); if (timer) |*t| t.reset();
requestNextTest(child.stdin.?, &metadata.?, &sub_prog_node) catch |err| { requestNextTest(child.stdin.?, &opt_metadata.*.?, &sub_prog_node) catch |err| return .{ .write_failed = err };
try run.step.addError("unable to write stdin: {s}", .{@errorName(err)});
break :poll true;
};
}, },
.test_started => { .test_started => {
test_is_running = true; active_test_index = opt_metadata.*.?.next_index - 1;
if (timer) |*t| t.reset(); if (timer) |*t| t.reset();
}, },
.test_results => { .test_results => {
assert(fuzz_context == null); assert(fuzz_context == null);
const md = &metadata.?; const md = &opt_metadata.*.?;
const TrHdr = std.zig.Server.Message.TestResults; const TrHdr = std.zig.Server.Message.TestResults;
const tr_hdr: *align(1) const TrHdr = @ptrCast(body); const tr_hdr: *align(1) const TrHdr = @ptrCast(body);
fail_count +|= @intFromBool(tr_hdr.flags.fail); assert(tr_hdr.index == active_test_index);
skip_count +|= @intFromBool(tr_hdr.flags.skip);
leak_count +|= @intFromBool(tr_hdr.flags.leak); switch (tr_hdr.flags.status) {
log_err_count +|= tr_hdr.flags.log_err_count; .pass => {},
.skip => results.skip_count +|= 1,
.fail => results.fail_count +|= 1,
}
const leak_count = tr_hdr.flags.leak_count;
const log_err_count = tr_hdr.flags.log_err_count;
results.leak_count +|= leak_count;
results.log_err_count +|= log_err_count;
if (tr_hdr.flags.fuzz) try run.fuzz_tests.append(gpa, tr_hdr.index); if (tr_hdr.flags.fuzz) try run.fuzz_tests.append(gpa, tr_hdr.index);
if (tr_hdr.flags.fail or tr_hdr.flags.leak or tr_hdr.flags.log_err_count > 0) { if (tr_hdr.flags.status == .fail) {
const name = std.mem.sliceTo(md.testName(tr_hdr.index), 0); const name = std.mem.sliceTo(md.testName(tr_hdr.index), 0);
const stderr_contents = stderr.buffered(); const stderr_bytes = std.mem.trim(u8, stderr.buffered(), "\n");
stderr.toss(stderr_contents.len); stderr.tossBuffered();
const msg = std.mem.trim(u8, stderr_contents, "\n"); if (stderr_bytes.len == 0) {
const label = if (tr_hdr.flags.fail) try run.step.addError("'{s}' failed without output", .{name});
"failed"
else if (tr_hdr.flags.leak)
"leaked"
else if (tr_hdr.flags.log_err_count > 0)
"logged errors"
else
unreachable;
if (msg.len > 0) {
try run.step.addError("'{s}' {s}: {s}", .{ name, label, msg });
} else { } else {
try run.step.addError("'{s}' {s}", .{ name, label }); try run.step.addError("'{s}' failed:\n{s}", .{ name, stderr_bytes });
} }
} else if (leak_count > 0) {
const name = std.mem.sliceTo(md.testName(tr_hdr.index), 0);
const stderr_bytes = std.mem.trim(u8, stderr.buffered(), "\n");
stderr.tossBuffered();
try run.step.addError("'{s}' leaked {d} allocations:\n{s}", .{ name, leak_count, stderr_bytes });
} else if (log_err_count > 0) {
const name = std.mem.sliceTo(md.testName(tr_hdr.index), 0);
const stderr_bytes = std.mem.trim(u8, stderr.buffered(), "\n");
stderr.tossBuffered();
try run.step.addError("'{s}' logged {d} errors:\n{s}", .{ name, log_err_count, stderr_bytes });
} }
test_is_running = false; active_test_index = null;
if (timer) |*t| md.ns_per_test[tr_hdr.index] = t.lap(); if (timer) |*t| md.ns_per_test[tr_hdr.index] = t.lap();
requestNextTest(child.stdin.?, md, &sub_prog_node) catch |err| { requestNextTest(child.stdin.?, md, &sub_prog_node) catch |err| return .{ .write_failed = err };
try run.step.addError("unable to write stdin: {s}", .{@errorName(err)});
break :poll true;
};
}, },
.coverage_id => { .coverage_id => {
const fuzz = fuzz_context.?.fuzz; const fuzz = fuzz_context.?.fuzz;
@ -1961,39 +2020,7 @@ fn evalZigTest(
}, },
else => {}, // ignore other messages else => {}, // ignore other messages
} }
};
if (any_write_failed) {
// The compiler unexpectedly closed stdin; something is very wrong and has probably crashed.
// We want to make sure we've captured all of stderr so that it's logged below.
while (try poller.poll()) {}
} }
const stderr = poller.reader(.stderr);
if (stderr.buffered().len > 0) {
const new_bytes = stderr.buffered();
const old_len = result_stderr.len;
result_stderr = try gpa.realloc(result_stderr, old_len + new_bytes.len);
@memcpy(result_stderr[old_len..], new_bytes);
}
// Send EOF to stdin.
child.stdin.?.close();
child.stdin = null;
return .{
.stdout = null,
.stderr = null,
.test_results = .{
.test_count = test_count,
.fail_count = fail_count,
.skip_count = skip_count,
.leak_count = leak_count,
.timeout_count = timeout_count,
.log_err_count = log_err_count,
},
.test_metadata = metadata,
};
} }
const TestMetadata = struct { const TestMetadata = struct {
@ -2077,10 +2104,15 @@ fn sendRunFuzzTestMessage(
try file.writeAll(full_msg); try file.writeAll(full_msg);
} }
fn evalGeneric(run: *Run, child: *std.process.Child) !StdIoResult { fn evalGeneric(run: *Run, child: *std.process.Child) !EvalGenericResult {
const b = run.step.owner; const b = run.step.owner;
const arena = b.allocator; const arena = b.allocator;
try child.spawn();
errdefer _ = child.kill() catch {};
try child.waitForSpawn();
switch (run.stdin) { switch (run.stdin) {
.bytes => |bytes| { .bytes => |bytes| {
child.stdin.?.writeAll(bytes) catch |err| { child.stdin.?.writeAll(bytes) catch |err| {
@ -2170,11 +2202,12 @@ fn evalGeneric(run: *Run, child: *std.process.Child) !StdIoResult {
} }
}; };
run.step.result_peak_rss = child.resource_usage_statistics.getMaxRss() orelse 0;
return .{ return .{
.term = try child.wait(),
.stdout = stdout_bytes, .stdout = stdout_bytes,
.stderr = stderr_bytes, .stderr = stderr_bytes,
.test_results = .{},
.test_metadata = null,
}; };
} }

26
lib/std/heap/debug_allocator.zig
View file

@ -421,10 +421,10 @@ pub fn DebugAllocator(comptime config: Config) type {
return usedBitsCount(slot_count) * @sizeOf(usize); return usedBitsCount(slot_count) * @sizeOf(usize);
} }
fn detectLeaksInBucket(bucket: *BucketHeader, size_class_index: usize, used_bits_count: usize) bool { fn detectLeaksInBucket(bucket: *BucketHeader, size_class_index: usize, used_bits_count: usize) usize {
const size_class = @as(usize, 1) << @as(Log2USize, @intCast(size_class_index)); const size_class = @as(usize, 1) << @as(Log2USize, @intCast(size_class_index));
const slot_count = slot_counts[size_class_index]; const slot_count = slot_counts[size_class_index];
var leaks = false; var leaks: usize = 0;
for (0..used_bits_count) |used_bits_byte| { for (0..used_bits_count) |used_bits_byte| {
const used_int = bucket.usedBits(used_bits_byte).*; const used_int = bucket.usedBits(used_bits_byte).*;
if (used_int != 0) { if (used_int != 0) {
@ -437,7 +437,7 @@ pub fn DebugAllocator(comptime config: Config) type {
const page_addr = @intFromPtr(bucket) & ~(page_size - 1); const page_addr = @intFromPtr(bucket) & ~(page_size - 1);
const addr = page_addr + slot_index * size_class; const addr = page_addr + slot_index * size_class;
log.err("memory address 0x{x} leaked: {f}", .{ addr, stack_trace }); log.err("memory address 0x{x} leaked: {f}", .{ addr, stack_trace });
leaks = true; leaks += 1;
} }
} }
} }
@ -445,16 +445,16 @@ pub fn DebugAllocator(comptime config: Config) type {
return leaks; return leaks;
} }
/// Emits log messages for leaks and then returns whether there were any leaks. /// Emits log messages for leaks and then returns the number of detected leaks (0 if no leaks were detected).
pub fn detectLeaks(self: *Self) bool { pub fn detectLeaks(self: *Self) usize {
var leaks = false; var leaks: usize = 0;
for (self.buckets, 0..) |init_optional_bucket, size_class_index| { for (self.buckets, 0..) |init_optional_bucket, size_class_index| {
var optional_bucket = init_optional_bucket; var optional_bucket = init_optional_bucket;
const slot_count = slot_counts[size_class_index]; const slot_count = slot_counts[size_class_index];
const used_bits_count = usedBitsCount(slot_count); const used_bits_count = usedBitsCount(slot_count);
while (optional_bucket) |bucket| { while (optional_bucket) |bucket| {
leaks = detectLeaksInBucket(bucket, size_class_index, used_bits_count) or leaks; leaks += detectLeaksInBucket(bucket, size_class_index, used_bits_count);
optional_bucket = bucket.prev; optional_bucket = bucket.prev;
} }
} }
@ -466,7 +466,7 @@ pub fn DebugAllocator(comptime config: Config) type {
log.err("memory address 0x{x} leaked: {f}", .{ log.err("memory address 0x{x} leaked: {f}", .{
@intFromPtr(large_alloc.bytes.ptr), stack_trace, @intFromPtr(large_alloc.bytes.ptr), stack_trace,
}); });
leaks = true; leaks += 1;
} }
return leaks; return leaks;
} }
@ -498,11 +498,17 @@ pub fn DebugAllocator(comptime config: Config) type {
/// Returns `std.heap.Check.leak` if there were leaks; `std.heap.Check.ok` otherwise. /// Returns `std.heap.Check.leak` if there were leaks; `std.heap.Check.ok` otherwise.
pub fn deinit(self: *Self) std.heap.Check { pub fn deinit(self: *Self) std.heap.Check {
const leaks = if (config.safety) self.detectLeaks() else false; const leaks: usize = if (config.safety) self.detectLeaks() else 0;
self.deinitWithoutLeakChecks();
return if (leaks == 0) .ok else .leak;
}
/// Like `deinit`, but does not check for memory leaks. This is useful if leaks have already
/// been detected manually with `detectLeaks` to avoid reporting them for a second time.
pub fn deinitWithoutLeakChecks(self: *Self) void {
if (config.retain_metadata) self.freeRetainedMetadata(); if (config.retain_metadata) self.freeRetainedMetadata();
self.large_allocations.deinit(self.backing_allocator); self.large_allocations.deinit(self.backing_allocator);
self.* = undefined; self.* = undefined;
return if (leaks) .leak else .ok;
} }
fn collectStackTrace(first_trace_addr: usize, addr_buf: *[stack_n]usize) void { fn collectStackTrace(first_trace_addr: usize, addr_buf: *[stack_n]usize) void {

13
lib/std/zig/Server.zig
View file

@ -96,15 +96,16 @@ pub const Message = struct {
pub const TestResults = extern struct { pub const TestResults = extern struct {
index: u32, index: u32,
flags: Flags, flags: Flags align(4),
pub const Flags = packed struct(u32) { pub const Flags = packed struct(u64) {
fail: bool, status: Status,
skip: bool,
leak: bool,
fuzz: bool, fuzz: bool,
log_err_count: u28 = 0, log_err_count: u30,
leak_count: u31,
}; };
pub const Status = enum(u2) { pass, fail, skip };
}; };
/// Trailing is the same as in `std.Build.abi.time_report.CompileResult`, excluding `step_name`. /// Trailing is the same as in `std.Build.abi.time_report.CompileResult`, excluding `step_name`.