| ... | @@ -2531,12 +2531,6 @@ pub fn addErrorTraceTests( | ... | @@ -2531,12 +2531,6 @@ pub fn addErrorTraceTests( |
| 2531 | return step; | 2531 | return step; |
| 2532 | } | 2532 | } |
| 2533 | | 2533 | |
| 2534 | fn 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 | | | |
| 2540 | pub fn addStandaloneTests( | 2534 | pub fn addStandaloneTests( |
| 2541 | b: *std.Build, | 2535 | b: *std.Build, |
| 2542 | optimize_modes: []const OptimizeMode, | 2536 | optimize_modes: []const OptimizeMode, |
| ... | @@ -2545,21 +2539,19 @@ pub fn addStandaloneTests( | ... | @@ -2545,21 +2539,19 @@ pub fn addStandaloneTests( |
| 2545 | enable_symlinks_windows: bool, | 2539 | enable_symlinks_windows: bool, |
| 2546 | ) *Step { | 2540 | ) *Step { |
| 2547 | const step = b.step("test-standalone", "Run the standalone tests"); | 2541 | const step = b.step("test-standalone", "Run the standalone tests"); |
| 2548 | if (compilerHasPackageManager(b)) { | 2542 | const test_cases_dep_name = "standalone_test_cases"; |
| 2549 | const test_cases_dep_name = "standalone_test_cases"; | 2543 | const test_cases_dep = b.dependency(test_cases_dep_name, .{ |
| 2550 | const test_cases_dep = b.dependency(test_cases_dep_name, .{ | 2544 | .enable_ios_sdk = enable_ios_sdk, |
| 2551 | .enable_ios_sdk = enable_ios_sdk, | 2545 | .enable_macos_sdk = enable_macos_sdk, |
| 2552 | .enable_macos_sdk = enable_macos_sdk, | 2546 | .enable_symlinks_windows = enable_symlinks_windows, |
| 2553 | .enable_symlinks_windows = enable_symlinks_windows, | 2547 | .simple_skip_debug = mem.findScalar(OptimizeMode, optimize_modes, .debug) == null, |
| 2554 | .simple_skip_debug = mem.findScalar(OptimizeMode, optimize_modes, .debug) == null, | 2548 | .simple_skip_release_safe = mem.findScalar(OptimizeMode, optimize_modes, .safe) == null, |
| 2555 | .simple_skip_release_safe = mem.findScalar(OptimizeMode, optimize_modes, .safe) == null, | 2549 | .simple_skip_release_fast = mem.findScalar(OptimizeMode, optimize_modes, .fast) == null, |
| 2556 | .simple_skip_release_fast = mem.findScalar(OptimizeMode, optimize_modes, .fast) == null, | 2550 | .simple_skip_release_small = mem.findScalar(OptimizeMode, optimize_modes, .small) == null, |
| 2557 | .simple_skip_release_small = mem.findScalar(OptimizeMode, optimize_modes, .small) == null, | 2551 | }); |
| 2558 | }); | 2552 | const test_cases_dep_step = test_cases_dep.builder.default_step; |
| 2559 | const test_cases_dep_step = test_cases_dep.builder.default_step; | 2553 | test_cases_dep_step.name = b.graph.dupeString(test_cases_dep_name); |
| 2560 | test_cases_dep_step.name = b.graph.dupeString(test_cases_dep_name); | 2554 | step.dependOn(test_cases_dep.builder.default_step); |
| 2561 | step.dependOn(test_cases_dep.builder.default_step); | | |
| 2562 | } | | |
| 2563 | return step; | 2555 | return step; |
| 2564 | } | 2556 | } |
| 2565 | | 2557 | |
Andrew Kelley <andrew@ziglang.org> 2026-08-07 12:32:58-07:00
test