bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix dogfood tests on Appveyor

Browse source 
This introduces a work-around for a bug in rustup.rs when excuting
cargo from a custom toolchain. Instead of trusting rustup to
invoke cargo from one of the release channels we just invoke
nightly cargo directly.
This commit is contained in:
Michael Wright 2019-01-26 11:10:13 +02:00
parent c5325063c8
commit 94a6eb0695
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main.rs
View file

@ -97,6 +97,12 @@ where
}) })
.map(|p| ("CARGO_TARGET_DIR", p)); .map(|p| ("CARGO_TARGET_DIR", p));
// Run the dogfood tests directly on nightly cargo. This is required due
// to a bug in rustup.rs when running cargo on custom toolchains. See issue #3118.
if std::env::var_os("CLIPPY_DOGFOOD").is_some() && cfg!(windows) {
args.insert(0, "+nightly".to_string());
}
let exit_status = std::process::Command::new("cargo") let exit_status = std::process::Command::new("cargo")
.args(&args) .args(&args)
.env("RUSTC_WRAPPER", path) .env("RUSTC_WRAPPER", path)

4
tests/dogfood.rs
View file

@ -1,6 +1,6 @@
#[test] #[test]
fn dogfood() { fn dogfood() {
if option_env!("RUSTC_TEST_SUITE").is_some() || cfg!(windows) { if option_env!("RUSTC_TEST_SUITE").is_some() {
return; return;
} }
let root_dir = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")); let root_dir = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"));
@ -30,7 +30,7 @@ fn dogfood() {
#[test] #[test]
fn dogfood_tests() { fn dogfood_tests() {
if option_env!("RUSTC_TEST_SUITE").is_some() || cfg!(windows) { if option_env!("RUSTC_TEST_SUITE").is_some() {
return; return;
} }
let root_dir = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")); let root_dir = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"));