authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2026-09-14 03:24:28-04:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2026-09-26 19:08:50-04:00
log8a6475c4f79374975be61ac7be13e164956d1a5c
tree23c468ee4bf571e80949fc101a233e73da18cc0c
parent207c883bfbdc3099997087869234d6e109bdb0cc

test-new-incremental: combine targets into a single Run step

Since the test protocol Client supports crashing step recovery, we can just model this as multiple tests in one binary.

1 files changed, 20 insertions(+), 21 deletions(-)

test/tests.zig+20-21
...@@ -3456,6 +3456,19 @@ pub fn addNewIncrementalTests(...@@ -3456,6 +3456,19 @@ pub fn addNewIncrementalTests(
3456 .directory => {},3456 .directory => {},
3457 }3457 }
34583458
3459 const run = b.addRunArtifact(runner);
3460 run.setName(@"test".name);
3461 run.enableProtocolMode();
3462
3463 switch (@"test".kind) {
3464 else => continue,
3465 .file => run.addFileArg(test_path),
3466 .directory => run.addDirectoryArg(test_path),
3467 }
3468 run.addPrefixedFileArg("--zig=", .zig_exe);
3469 run.addPrefixedDirectoryArg("--lib=", .zig_lib);
3470 _ = run.addPrefixedOutputDirectoryArg("--src=", "src");
3471
3459 for (incremental_targets) |test_target| {3472 for (incremental_targets) |test_target| {
3460 const resolved_target = b.resolveTargetQuery(test_target.target);3473 const resolved_target = b.resolveTargetQuery(test_target.target);
34613474
...@@ -3486,30 +3499,16 @@ pub fn addNewIncrementalTests(...@@ -3486,30 +3499,16 @@ pub fn addNewIncrementalTests(
3486 } else continue;3499 } else continue;
3487 }3500 }
34883501
3489 const run = b.addRunArtifact(runner);
3490 run.setName(@"test".name);
3491 run.enableProtocolMode();
3492
3493 switch (@"test".kind) {
3494 else => continue,
3495 .file => run.addFileArg(test_path),
3496 .directory => run.addDirectoryArg(test_path),
3497 }
3498 run.addPrefixedFileArg("--zig=", .zig_exe);
3499 run.addPrefixedDirectoryArg("--lib=", .zig_lib);
3500 _ = run.addPrefixedOutputDirectoryArg("--src=", "src");
3501 run.addArgs(&.{ "--target", target_str });3502 run.addArgs(&.{ "--target", target_str });
3503 }
35023504
3503 run.addArg("--quiet"); // don't fill stderr telling us about skipped tests etc3505 run.addThirdPartyEnabledArgDarling(.{ .enabled = "-fdarling" });
35043506 run.addThirdPartyEnabledArgQemu(.{ .enabled = "-fqemu" });
3505 run.addThirdPartyEnabledArgDarling(.{ .enabled = "-fdarling" });3507 run.addThirdPartyEnabledArgRosetta(.{ .enabled = "-frosetta" });
3506 run.addThirdPartyEnabledArgQemu(.{ .enabled = "-fqemu" });3508 run.addThirdPartyEnabledArgWasmtime(.{ .enabled = "-fwasmtime" });
3507 run.addThirdPartyEnabledArgRosetta(.{ .enabled = "-frosetta" });3509 run.addThirdPartyEnabledArgWine(.{ .enabled = "-fwine" });
3508 run.addThirdPartyEnabledArgWasmtime(.{ .enabled = "-fwasmtime" });
3509 run.addThirdPartyEnabledArgWine(.{ .enabled = "-fwine" });
35103510
3511 tests_step.dependOn(&run.step);3511 tests_step.dependOn(&run.step);
3512 }
3513 }3512 }
35143513
3515 return tests_step;3514 return tests_step;