Mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2026-04-26 13:01:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

tests: move incremental target matrix out of manifests

Browse Source 
Having the matrix of test targets for incremental compilation in the
individual test manifests has turned out to be inconvenient for a few
reasons: the tests are almost certain to accidentally get out of sync,
disabling targets entirely is annoying to do, and incr-check needs to
take care to print the target in all error messages (which currently
does not always happen).

If I recall correctly, I originally designed it this way because it
allows targets to be disabled at the granularity of individual tests,
but there's an easier approach to that: just let a test manifest that it
should be *skipped* on a certain target! As skipping is the rare case,
and also the case you want readers to notice, it makes sense for *it* to
be explicitly specified, like how unit tests use `error.SkipZigTest`.

So, `incr-check` no longer runs through a list of targets specified in
the manifest. Instead, it accepts (and, in fact, requires) a single
target on the command line, and runs the test for that specific target.
If the file contains a `#skip_target` directive for that target, then
`incr-check` exits immediately, so we can still disable targets at
individual test granularity, but you can also disable a target for all
tests by just commenting it out of the matrix in `test/tests.zig`.

As a nice bonus, this also allows the build system to run different
incremental test targets in parallel, because the targets are now
different steps.

This definitely seems like a better way to split the work between the
build system and incr-check---sorry for getting this wrong initially!
This commit is contained in:
Matthew Lugg
2026-04-14 10:26:35 +01:00
committed by mlugg
parent 8578b07faa
commit 291addadf8
39 changed files with 269 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/incremental/add_decl
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
const std = @import("std");
test/incremental/add_decl_namespaced
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
const std = @import("std");
test/incremental/add_remove_struct_fields
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
const S = struct { x: u8 };
test/incremental/add_remove_toplevel_fields
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
const S = @This();
test/incremental/analysis_error_and_syntax_error
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
pub fn main() !void {
test/incremental/bad_import
-7
View File
@@ -1,10 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
pub fn main() !void {
test/incremental/change_embed_file
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
const std = @import("std");
test/incremental/change_enum_tag_type
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
const Tag = u2;
test/incremental/change_exports
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
#update=initial version
#file=main.zig
export fn foo() void {}
test/incremental/change_fn_type
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
pub fn main() !void {
test/incremental/change_generic_line_number
-4
View File
@@ -1,7 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
const std = @import("std");
test/incremental/change_line_number
-4
View File
@@ -1,7 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
const std = @import("std");
test/incremental/change_module
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#module=foo=foo.zig
#update=initial version
test/incremental/change_panic_handler
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
pub fn main() !u8 {
test/incremental/change_panic_handler_explicit
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
pub fn main() !u8 {
test/incremental/change_shift_op
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
pub fn main() !void {
test/incremental/change_struct_same_fields
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
const S = extern struct { x: u8, y: u8 };
test/incremental/change_zon_file
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
const std = @import("std");
test/incremental/change_zon_file_no_result_type
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
const std = @import("std");
test/incremental/compile_error_then_log
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version with compile error
#file=main.zig
pub fn main() void {}
test/incremental/compile_log
-7
View File
@@ -1,10 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version with no compile log
#file=main.zig
const std = @import("std");
test/incremental/delete_comptime_decls
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
pub fn main() void {}
test/incremental/dependency_on_type_of_inferred_global
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
const foo = @as(u8, 123);
test/incremental/fix_astgen_failure
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version with error
#file=main.zig
pub fn main() !void {
test/incremental/function_becomes_inline
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=non-inline version
#file=main.zig
pub fn main() !void {
test/incremental/hello
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
const std = @import("std");
test/incremental/make_decl_pub
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
const foo = @import("foo.zig");
test/incremental/modify_inline_fn
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
const std = @import("std");
test/incremental/move_src
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
const std = @import("std");
test/incremental/no_change_preserves_tag_names
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
const std = @import("std");
test/incremental/recursive_function_becomes_non_recursive
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
pub fn main() !void {
test/incremental/remove_enum_field
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
const MyEnum = enum(u8) {
test/incremental/remove_invalid_union_backing_enum
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
const E = enum { a, b, c };
test/incremental/temporary_parse_error
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
const std = @import("std");
test/incremental/type_becomes_comptime_only
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
const SomeType = u32;
test/incremental/type_dependency_loop
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
pub const A = struct { b: B };
test/incremental/unreferenced_error
-6
View File
@@ -1,9 +1,3 @@
#target=x86_64-linux-selfhosted
//#target=x86_64-windows-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=x86_64-linux-llvm
//#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
const std = @import("std");
test/tests.zig
+37 -11
View File
@@ -1989,6 +1989,26 @@ const c_abi_targets = blk: {
};
};
/// Unlike `test_targets` and `c_abi_targets`, these targets are just simple strings which we pass
/// directly to `incr-check`. They include the target triple and the compiler backend.
///
/// If only one specific test is failing on a target, instead of entirely disabling the target here,
/// you can skip the target for that specific test only by adding a line like this to the manifest:
/// #skip_target=x86_64-linux-selfhosted
const incremental_targets: []const []const u8 = &.{
// Avoid adding more CBE or LLVM targets without good reason: they're a lot slower than others
// to run due to the output (C source code or LLVM IR) being built non-incrementally (by Clang
// or LLVM). We just have a couple here to make sure that it works.
"x86_64-linux-cbe",
"x86_64-linux-llvm",
"x86_64-linux-selfhosted",
// https://codeberg.org/ziglang/zig/issues/31773
//"x86_64-windows-selfhosted",
// https://codeberg.org/ziglang/zig/issues/31810
//"wasm32-wasi-selfhosted",
};
fn compatible32bitArch(b: *std.Build) ?std.Target.Cpu.Arch {
const host = b.graph.host.result;
return switch (host.os.tag) {
@@ -2935,21 +2955,27 @@ pub fn addIncrementalTests(b: *std.Build, test_step: *Step, test_filters: []cons
if (std.mem.indexOf(u8, entry.path, test_filter)) |_| break;
} else if (test_filters.len > 0) continue;
const run = b.addRunArtifact(incr_check);
run.setName(b.fmt("incr-check '{s}'", .{entry.basename}));
for (incremental_targets) |target_str| {
const run = b.addRunArtifact(incr_check);
run.setName(b.fmt("incr-check {s} '{s}'", .{ target_str, entry.basename }));
run.addArg(b.graph.zig_exe);
run.addFileArg(b.path("test/incremental/").path(b, entry.path));
run.addArgs(&.{ "--zig-lib-dir", b.fmt("{f}", .{b.graph.zig_lib_directory}) });
run.addArg(b.graph.zig_exe);
run.addFileArg(b.path("test/incremental/").path(b, entry.path));
run.addArgs(&.{
"--zig-lib-dir", b.graph.zig_lib_directory.path orelse ".",
"--target", target_str,
});
if (b.enable_qemu) run.addArg("-fqemu");
if (b.enable_wine) run.addArg("-fwine");
if (b.enable_wasmtime) run.addArg("-fwasmtime");
if (b.enable_darling) run.addArg("-fdarling");
run.addArg("--quiet"); // don't fill stderr telling us about skipped tests etc
run.addCheck(.{ .expect_term = .{ .exited = 0 } });
if (b.enable_qemu) run.addArg("-fqemu");
if (b.enable_wine) run.addArg("-fwine");
if (b.enable_wasmtime) run.addArg("-fwasmtime");
if (b.enable_darling) run.addArg("-fdarling");
test_step.dependOn(&run.step);
run.addCheck(.{ .expect_term = .{ .exited = 0 } });
test_step.dependOn(&run.step);
}
}
}