]> git.lizzy.rs Git - rust.git/commit - src/tools/miri
Rollup merge of #95369 - jyn514:test-rustdoc, r=Mark-Simulacrum
authorDylan DPC <99973273+Dylan-DPC@users.noreply.github.com>
Sat, 9 Apr 2022 16:26:26 +0000 (18:26 +0200)
committerGitHub <noreply@github.com>
Sat, 9 Apr 2022 16:26:26 +0000 (18:26 +0200)
commit198a1548ea4c25e3756d70bb2cafed6bb1860d6a
treec5c209f17952529e68d5d94eb2be7fdd95b332f8
parente4b4bf1535ab3539c4573c8d960214c6e49eb138
parent26cc0be248b2f013f96bf47ccc24f99e4424c991
Rollup merge of #95369 - jyn514:test-rustdoc, r=Mark-Simulacrum

Fix `x test src/librustdoc` with `download-rustc` enabled

The problem was two-fold:
- Bootstrap was hard-coding that unit tests should always run with stage1, not stage2, and
- It hard-coded the sysroot layout in stage1, which puts libLLVM.so in `lib/rustlib/` instead of just `lib/`.

This also takes the liberty of fixing `test src/librustdoc --no-doc`, which has been broken since it was first added. It would be nice at some point to unify this logic with other tests; I opened a Zulip thread: https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/Inconsistency.20in.20.60x.20test.60

Fixes https://github.com/rust-lang/rust/issues/91071.
src/bootstrap/test.rs