| ... | @@ -2523,19 +2523,6 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step { | ... | @@ -2523,19 +2523,6 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step { |
| 2523 | const would_use_llvm = wouldUseLlvm(test_target.use_llvm, test_target.target, test_target.optimize_mode); | 2523 | const would_use_llvm = wouldUseLlvm(test_target.use_llvm, test_target.target, test_target.optimize_mode); |
| 2524 | if (options.skip_llvm and would_use_llvm) continue; | 2524 | if (options.skip_llvm and would_use_llvm) continue; |
| 2525 | | 2525 | |
| 2526 | if (would_use_llvm and (mem.eql(u8, options.name, "compiler-rt") or mem.eql(u8, options.name, "zigc"))) { | | |
| 2527 | switch (test_target.optimize_mode) { | | |
| 2528 | .Debug, .ReleaseSafe => { | | |
| 2529 | // LLVM 21 is affected by multiple bugs in safe builds of compiler-rt: | | |
| 2530 | // * https://codeberg.org/ziglang/zig/issues/31701 | | |
| 2531 | // * https://codeberg.org/ziglang/zig/issues/31702 | | |
| 2532 | // ...so for now, skip these tests. | | |
| 2533 | continue; | | |
| 2534 | }, | | |
| 2535 | .ReleaseSmall, .ReleaseFast => {}, | | |
| 2536 | } | | |
| 2537 | } | | |
| 2538 | | | |
| 2539 | const triple_txt = resolved_target.query.zigTriple(b.allocator) catch @panic("OOM"); | 2526 | const triple_txt = resolved_target.query.zigTriple(b.allocator) catch @panic("OOM"); |
| 2540 | | 2527 | |
| 2541 | if (options.test_target_filters.len > 0) { | 2528 | if (options.test_target_filters.len > 0) { |
| ... | @@ -2610,7 +2597,14 @@ fn addOneModuleTest( | ... | @@ -2610,7 +2597,14 @@ fn addOneModuleTest( |
| 2610 | .zig_lib_dir = b.path("lib"), | 2597 | .zig_lib_dir = b.path("lib"), |
| 2611 | }); | 2598 | }); |
| 2612 | these_tests.linkage = test_target.linkage; | 2599 | these_tests.linkage = test_target.linkage; |
| 2613 | if (options.no_builtin) these_tests.root_module.no_builtin = true; | 2600 | // https://codeberg.org/ziglang/zig/issues/31701 |
| | 2601 | if (!(mem.eql(u8, options.name, "compiler-rt") or mem.eql(u8, options.name, "zigc"))) { |
| | 2602 | if (options.no_builtin) these_tests.root_module.no_builtin = true; |
| | 2603 | } |
| | 2604 | // https://codeberg.org/ziglang/zig/issues/31702 |
| | 2605 | if (mem.eql(u8, options.name, "compiler-rt") or mem.eql(u8, options.name, "zigc")) { |
| | 2606 | these_tests.root_module.stack_protector = false; |
| | 2607 | } |
| 2614 | if (options.build_options) |build_options| { | 2608 | if (options.build_options) |build_options| { |
| 2615 | these_tests.root_module.addOptions("build_options", build_options); | 2609 | these_tests.root_module.addOptions("build_options", build_options); |
| 2616 | } | 2610 | } |
Alex Rønne Petersen <alex@alexrp.com> 2026-04-16 17:33:35+02:00
Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM
test