| author |  Jakub Konka <kubkon@jakubkonka.com> 2022-09-07 23:16:42+02:00 |
| committer | Jakub Konka <kubkon@jakubkonka.com> 2022-09-07 23:16:42+02:00 |
| log | 0e152b76ac0da0f8132091202eba9f6cebd0e616 |
| tree | bcd9c29fbdaa91c884768e7c1d7e662cfc63ea27 |
| parent | c4d297b1af832739a487fa511d16b902dd4fca99 |
tests: force LLD off for stage2 backends until auto-select deems worthy
2 files changed, 6 insertions(+), 12 deletions(-)
src/test.zig+4-5
| ... | @@ -1548,13 +1548,12 @@ pub const TestContext = struct { | ... | @@ -1548,13 +1548,12 @@ pub const TestContext = struct { |
| 1548 | .self_exe_path = std.testing.zig_exe_path, | 1548 | .self_exe_path = std.testing.zig_exe_path, |
| 1549 | // TODO instead of turning off color, pass in a std.Progress.Node | 1549 | // TODO instead of turning off color, pass in a std.Progress.Node |
| 1550 | .color = .off, | 1550 | .color = .off, |
| 1551 | // TODO: We set these to no so that we don't fallback to LLD for incremental linking context. This is because | 1551 | // TODO: force self-hosted linkers with stage2 backend to avoid LLD creeping in |
| 1552 | // our own COFF linker doesn't yet support these options. | 1552 | // until the auto-select mechanism deems them worthy |
| 1553 | .want_unwind_tables = switch (case.backend) { | 1553 | .use_lld = switch (case.backend) { |
| 1554 | .stage2 => if (target.os.tag == .windows) false else null, | 1554 | .stage2 => false, |
| 1555 | else => null, | 1555 | else => null, |
| 1556 | }, | 1556 | }, |
| 1557 | .emit_implib = null, | ||
| 1558 | }); | 1557 | }); |
| 1559 | defer comp.destroy(); | 1558 | defer comp.destroy(); |
| 1560 | 1559 |
test/tests.zig+2-7
| ... | @@ -701,13 +701,8 @@ pub fn addPkgTests( | ... | @@ -701,13 +701,8 @@ pub fn addPkgTests( |
| 701 | else => { | 701 | else => { |
| 702 | these_tests.use_stage1 = false; | 702 | these_tests.use_stage1 = false; |
| 703 | these_tests.use_llvm = false; | 703 | these_tests.use_llvm = false; |
| 704 | 704 | // TODO: force self-hosted linkers to avoid LLD creeping in until the auto-select mechanism deems them worthy | |
| 705 | if (test_target.target.getOsTag() == .windows) { | 705 | these_tests.use_lld = false; |
| 706 | // TODO: We set these to no so that we don't fallback to LLD for incremental linking context. This is because | ||
| 707 | // our own COFF linker doesn't yet support these options. | ||
| 708 | these_tests.emit_implib = .no_emit; | ||
| 709 | these_tests.use_unwind_tables = false; | ||
| 710 | } | ||
| 711 | }, | 706 | }, |
| 712 | }; | 707 | }; |
| 713 | 708 |