From fdbc62dd4f095c1b06986976cd5e03e494546b8c Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Wed, 17 May 2017 14:45:36 +0200 Subject: [PATCH] Use the workspace target directory --- tests/compile-test.rs | 4 ++-- tests/dogfood.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/compile-test.rs b/tests/compile-test.rs index 39a8380bc08..4c154859c7c 100644 --- a/tests/compile-test.rs +++ b/tests/compile-test.rs @@ -7,14 +7,14 @@ fn run_mode(dir: &'static str, mode: &'static str) { let mut config = compiletest::default_config(); let cfg_mode = mode.parse().expect("Invalid mode"); - config.target_rustcflags = Some("-L target/debug/ -L target/debug/deps".to_owned()); + config.target_rustcflags = Some("-L clippy_tests/target/debug/ -L clippy_tests/target/debug/deps".to_owned()); if let Ok(name) = var::<&str>("TESTNAME") { let s: String = name.to_owned(); config.filter = Some(s) } config.mode = cfg_mode; - config.build_base = PathBuf::from("target/debug/test_build_base"); + config.build_base = PathBuf::from("clippy_tests/target/debug/test_build_base"); config.src_base = PathBuf::from(format!("tests/{}", dir)); compiletest::run_tests(&config); diff --git a/tests/dogfood.rs b/tests/dogfood.rs index 83b2acf7d81..e6b8d6f7d6c 100644 --- a/tests/dogfood.rs +++ b/tests/dogfood.rs @@ -22,8 +22,8 @@ fn dogfood() { let cfg_mode = "run-fail".parse().expect("Invalid mode"); let mut s = String::new(); - s.push_str(" -L target/debug/"); - s.push_str(" -L target/debug/deps"); + s.push_str(" -L clippy_tests/target/debug/"); + s.push_str(" -L clippy_tests/target/debug/deps"); s.push_str(" -Zextra-plugins=clippy -Ltarget_recur/debug -Dwarnings -Dclippy_pedantic -Dclippy -Dclippy_internal"); config.target_rustcflags = Some(s); if let Ok(name) = var("TESTNAME") {