mirror of
https://codeberg.org/ziglang/zig.git
synced 2026-05-04 16:53:26 +03:00
58edefc6d1
Rework std.Build.Step to have an `owner: *Build` field. This simplified the implementation of installation steps, as well as provided some much-needed common API for the new parallelized build system. --verbose is now defined very concretely: it prints to stderr just before spawning a child process. Child process execution is updated to conform to the new parallel-friendly make() function semantics. DRY up the failWithCacheError handling code. It now integrates properly with the step graph instead of incorrectly dumping to stderr and calling process exit. In the main CLI, fix `zig fmt` crash when there are no errors and stdin is used. Deleted steps: * EmulatableRunStep - this entire thing can be removed in favor of a flag added to std.Build.RunStep called `skip_foreign_checks`. * LogStep - this doesn't really fit with a multi-threaded build runner and is effectively superseded by the new build summary output. build runner: * add -fsummary and -fno-summary to override the default behavior, which is to print a summary if any of the build steps fail. * print the dep prefix when emitting error messages for steps. std.Build.FmtStep: * This step now supports exclude paths as well as a check flag. * The check flag decides between two modes, modify mode, and check mode. These can be used to update source files in place, or to fail the build, respectively. Zig's own build.zig: * The `test-fmt` step will do all the `zig fmt` checking that we expect to be done. Since the `test` step depends on this one, we can simply remove the explicit call to `zig fmt` in the CI. * The new `fmt` step will actually perform `zig fmt` and update source files in place. std.Build.RunStep: * expose max_stdio_size is a field (previously an unchangeable hard-coded value). * rework the API. Instead of configuring each stream independently, there is a `stdio` field where you can choose between `infer_from_args`, `inherit`, or `check`. These determine whether the RunStep is considered to have side-effects or not. The previous field, `condition` is gone. * when stdio mode is set to `check` there is a slice of any number of checks to make, which include things like exit code, stderr matching, or stdout matching. * remove the ill-defined `print` field. * when adding an output arg, it takes the opportunity to give itself a better name. * The flag `skip_foreign_checks` is added. If this is true, a RunStep which is configured to check the output of the executed binary will not fail the build if the binary cannot be executed due to being for a foreign binary to the host system which is running the build graph. Command-line arguments such as -fqemu and -fwasmtime may affect whether a binary is detected as foreign, as well as system configuration such as Rosetta (macOS) and binfmt_misc (Linux). - This makes EmulatableRunStep no longer needed. * Fix the child process handling to properly integrate with the new bulid API and to avoid deadlocks in stdout/stderr streams by polling if necessary. std.Build.RemoveDirStep now uses the open build_root directory handle instead of an absolute path.
176 lines
6.4 KiB
Zig
176 lines
6.4 KiB
Zig
// This is the implementation of the test harness.
|
|
// For the actual test cases, see test/compare_output.zig.
|
|
const std = @import("std");
|
|
const ArrayList = std.ArrayList;
|
|
const fmt = std.fmt;
|
|
const mem = std.mem;
|
|
const fs = std.fs;
|
|
const OptimizeMode = std.builtin.OptimizeMode;
|
|
|
|
pub const CompareOutputContext = struct {
|
|
b: *std.Build,
|
|
step: *std.Build.Step,
|
|
test_index: usize,
|
|
test_filter: ?[]const u8,
|
|
optimize_modes: []const OptimizeMode,
|
|
|
|
const Special = enum {
|
|
None,
|
|
Asm,
|
|
RuntimeSafety,
|
|
};
|
|
|
|
const TestCase = struct {
|
|
name: []const u8,
|
|
sources: ArrayList(SourceFile),
|
|
expected_output: []const u8,
|
|
link_libc: bool,
|
|
special: Special,
|
|
cli_args: []const []const u8,
|
|
|
|
const SourceFile = struct {
|
|
filename: []const u8,
|
|
source: []const u8,
|
|
};
|
|
|
|
pub fn addSourceFile(self: *TestCase, filename: []const u8, source: []const u8) void {
|
|
self.sources.append(SourceFile{
|
|
.filename = filename,
|
|
.source = source,
|
|
}) catch unreachable;
|
|
}
|
|
|
|
pub fn setCommandLineArgs(self: *TestCase, args: []const []const u8) void {
|
|
self.cli_args = args;
|
|
}
|
|
};
|
|
|
|
pub fn createExtra(self: *CompareOutputContext, name: []const u8, source: []const u8, expected_output: []const u8, special: Special) TestCase {
|
|
var tc = TestCase{
|
|
.name = name,
|
|
.sources = ArrayList(TestCase.SourceFile).init(self.b.allocator),
|
|
.expected_output = expected_output,
|
|
.link_libc = false,
|
|
.special = special,
|
|
.cli_args = &[_][]const u8{},
|
|
};
|
|
const root_src_name = if (special == Special.Asm) "source.s" else "source.zig";
|
|
tc.addSourceFile(root_src_name, source);
|
|
return tc;
|
|
}
|
|
|
|
pub fn create(self: *CompareOutputContext, name: []const u8, source: []const u8, expected_output: []const u8) TestCase {
|
|
return createExtra(self, name, source, expected_output, Special.None);
|
|
}
|
|
|
|
pub fn addC(self: *CompareOutputContext, name: []const u8, source: []const u8, expected_output: []const u8) void {
|
|
var tc = self.create(name, source, expected_output);
|
|
tc.link_libc = true;
|
|
self.addCase(tc);
|
|
}
|
|
|
|
pub fn add(self: *CompareOutputContext, name: []const u8, source: []const u8, expected_output: []const u8) void {
|
|
const tc = self.create(name, source, expected_output);
|
|
self.addCase(tc);
|
|
}
|
|
|
|
pub fn addAsm(self: *CompareOutputContext, name: []const u8, source: []const u8, expected_output: []const u8) void {
|
|
const tc = self.createExtra(name, source, expected_output, Special.Asm);
|
|
self.addCase(tc);
|
|
}
|
|
|
|
pub fn addRuntimeSafety(self: *CompareOutputContext, name: []const u8, source: []const u8) void {
|
|
const tc = self.createExtra(name, source, undefined, Special.RuntimeSafety);
|
|
self.addCase(tc);
|
|
}
|
|
|
|
pub fn addCase(self: *CompareOutputContext, case: TestCase) void {
|
|
const b = self.b;
|
|
|
|
const write_src = b.addWriteFiles();
|
|
for (case.sources.items) |src_file| {
|
|
write_src.add(src_file.filename, src_file.source);
|
|
}
|
|
|
|
switch (case.special) {
|
|
Special.Asm => {
|
|
const annotated_case_name = fmt.allocPrint(self.b.allocator, "assemble-and-link {s}", .{
|
|
case.name,
|
|
}) catch unreachable;
|
|
if (self.test_filter) |filter| {
|
|
if (mem.indexOf(u8, annotated_case_name, filter) == null) return;
|
|
}
|
|
|
|
const exe = b.addExecutable(.{
|
|
.name = "test",
|
|
.target = .{},
|
|
.optimize = .Debug,
|
|
});
|
|
exe.addAssemblyFileSource(write_src.getFileSource(case.sources.items[0].filename).?);
|
|
|
|
const run = exe.run();
|
|
run.addArgs(case.cli_args);
|
|
run.expectStdErrEqual("");
|
|
run.expectStdOutEqual(case.expected_output);
|
|
|
|
self.step.dependOn(&run.step);
|
|
},
|
|
Special.None => {
|
|
for (self.optimize_modes) |optimize| {
|
|
const annotated_case_name = fmt.allocPrint(self.b.allocator, "{s} {s} ({s})", .{
|
|
"compare-output",
|
|
case.name,
|
|
@tagName(optimize),
|
|
}) catch unreachable;
|
|
if (self.test_filter) |filter| {
|
|
if (mem.indexOf(u8, annotated_case_name, filter) == null) continue;
|
|
}
|
|
|
|
const basename = case.sources.items[0].filename;
|
|
const exe = b.addExecutable(.{
|
|
.name = "test",
|
|
.root_source_file = write_src.getFileSource(basename).?,
|
|
.optimize = optimize,
|
|
.target = .{},
|
|
});
|
|
if (case.link_libc) {
|
|
exe.linkSystemLibrary("c");
|
|
}
|
|
|
|
const run = exe.run();
|
|
run.addArgs(case.cli_args);
|
|
run.expectStdErrEqual("");
|
|
run.expectStdOutEqual(case.expected_output);
|
|
|
|
self.step.dependOn(&run.step);
|
|
}
|
|
},
|
|
Special.RuntimeSafety => {
|
|
// TODO iterate over self.optimize_modes and test this in both
|
|
// debug and release safe mode
|
|
const annotated_case_name = fmt.allocPrint(self.b.allocator, "safety {s}", .{case.name}) catch unreachable;
|
|
if (self.test_filter) |filter| {
|
|
if (mem.indexOf(u8, annotated_case_name, filter) == null) return;
|
|
}
|
|
|
|
const basename = case.sources.items[0].filename;
|
|
const exe = b.addExecutable(.{
|
|
.name = "test",
|
|
.root_source_file = write_src.getFileSource(basename).?,
|
|
.target = .{},
|
|
.optimize = .Debug,
|
|
});
|
|
if (case.link_libc) {
|
|
exe.linkSystemLibrary("c");
|
|
}
|
|
|
|
const run = exe.run();
|
|
run.addArgs(case.cli_args);
|
|
run.expectExitCode(126);
|
|
|
|
self.step.dependOn(&run.step);
|
|
},
|
|
}
|
|
}
|
|
};
|