Skip to content

Commit daf7f2f

Browse files
committed
Auto merge of #8272 - ehuss:fix-llvm-tools, r=alexcrichton
Fix nightly tests with llvm-tools. rust-lang/rust#72000 removed `libLLVM-10-rust-1.45.0-nightly.so` from the default install. Several of the plugins tests fail without this, so make sure it gets installed.
2 parents d662f25 + e4863cf commit daf7f2f

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

CONTRIBUTING.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,11 @@ If you can't install an alternate target, you can set the
118118
`CFG_DISABLE_CROSS_TESTS=1` environment variable to disable these tests. The
119119
Windows cross tests only support the MSVC toolchain.
120120

121-
Some of the nightly tests require the `rustc-dev` component installed. This
122-
component includes the compiler as a library. This may already be installed
123-
with your nightly toolchain, but it if isn't, run `rustup component add
124-
rustc-dev --toolchain=nightly`.
121+
Some of the nightly tests require the `rustc-dev` and `llvm-tools-preview`
122+
rustup components installed. These components include the compiler as a
123+
library. This may already be installed with your nightly toolchain, but if it
124+
isn't, run `rustup component add rustc-dev llvm-tools-preview
125+
--toolchain=nightly`.
125126

126127
There are several other packages in the repo for running specialized tests,
127128
and you will need to run these tests separately by changing into its directory

ci/azure-install-rust.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ steps:
55
rustup component remove --toolchain=$TOOLCHAIN rust-docs || echo "already removed"
66
rustup update --no-self-update $TOOLCHAIN
77
if [[ "$TOOLCHAIN" == "nightly"* ]]; then
8-
rustup component add --toolchain=$TOOLCHAIN rustc-dev
8+
rustup component add --toolchain=$TOOLCHAIN rustc-dev llvm-tools-preview
99
fi
1010
rustup default $TOOLCHAIN
1111
displayName: Install rust

0 commit comments

Comments
 (0)