authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2026-08-07 12:32:58-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2026-08-07 12:32:58-07:00
log0f1c478db329c4b91c3a34aed2d48e4cde059eff
tree6dc48f25399ee88f833cb03592849cce2fa3d2b5
parent750294aa1f87815e23bac1f3e6e287cf9fa88705

tests: remove "compiler has package manager" logic

This is simplified now that package fetching is moved to Maker executable.

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

test/tests.zig+13-21
......@@ -2531,12 +2531,6 @@ pub fn addErrorTraceTests(
25312531 return step;
25322532}
25332533
2534fn compilerHasPackageManager(b: *std.Build) bool {
2535 // We can only use dependencies if the compiler was built with support for package management.
2536 // (zig2 doesn't support it, but we still need to construct a build graph to build stage3.)
2537 return b.available_deps.len != 0;
2538}
2539
25402534pub fn addStandaloneTests(
25412535 b: *std.Build,
25422536 optimize_modes: []const OptimizeMode,
......@@ -2545,21 +2539,19 @@ pub fn addStandaloneTests(
25452539 enable_symlinks_windows: bool,
25462540) *Step {
25472541 const step = b.step("test-standalone", "Run the standalone tests");
2548 if (compilerHasPackageManager(b)) {
2549 const test_cases_dep_name = "standalone_test_cases";
2550 const test_cases_dep = b.dependency(test_cases_dep_name, .{
2551 .enable_ios_sdk = enable_ios_sdk,
2552 .enable_macos_sdk = enable_macos_sdk,
2553 .enable_symlinks_windows = enable_symlinks_windows,
2554 .simple_skip_debug = mem.findScalar(OptimizeMode, optimize_modes, .debug) == null,
2555 .simple_skip_release_safe = mem.findScalar(OptimizeMode, optimize_modes, .safe) == null,
2556 .simple_skip_release_fast = mem.findScalar(OptimizeMode, optimize_modes, .fast) == null,
2557 .simple_skip_release_small = mem.findScalar(OptimizeMode, optimize_modes, .small) == null,
2558 });
2559 const test_cases_dep_step = test_cases_dep.builder.default_step;
2560 test_cases_dep_step.name = b.graph.dupeString(test_cases_dep_name);
2561 step.dependOn(test_cases_dep.builder.default_step);
2562 }
2542 const test_cases_dep_name = "standalone_test_cases";
2543 const test_cases_dep = b.dependency(test_cases_dep_name, .{
2544 .enable_ios_sdk = enable_ios_sdk,
2545 .enable_macos_sdk = enable_macos_sdk,
2546 .enable_symlinks_windows = enable_symlinks_windows,
2547 .simple_skip_debug = mem.findScalar(OptimizeMode, optimize_modes, .debug) == null,
2548 .simple_skip_release_safe = mem.findScalar(OptimizeMode, optimize_modes, .safe) == null,
2549 .simple_skip_release_fast = mem.findScalar(OptimizeMode, optimize_modes, .fast) == null,
2550 .simple_skip_release_small = mem.findScalar(OptimizeMode, optimize_modes, .small) == null,
2551 });
2552 const test_cases_dep_step = test_cases_dep.builder.default_step;
2553 test_cases_dep_step.name = b.graph.dupeString(test_cases_dep_name);
2554 step.dependOn(test_cases_dep.builder.default_step);
25632555 return step;
25642556}
25652557