about summary refs log tree commit diff
diff options
context:
space:
mode:
authordaxpedda <daxpedda@gmail.com>2021-02-06 17:57:31 +0100
committerdaxpedda <daxpedda@gmail.com>2021-02-06 17:57:31 +0100
commite2e33b4d355cb77d716a9fb191d2453b5ab5d42b (patch)
tree32d2a5b38f6ff5271e08e7c8b6c328a62d3e6773
parentcd361a5e64f3f1b5a1389701bc30f64538f8eb69 (diff)
downloadrust-e2e33b4d355cb77d716a9fb191d2453b5ab5d42b.tar.gz
rust-e2e33b4d355cb77d716a9fb191d2453b5ab5d42b.zip
Pick up `clippy.toml` in `ui-cargo` tests.
-rw-r--r--tests/compile-test.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/compile-test.rs b/tests/compile-test.rs
index 94f5e616cac..c0b40add109 100644
--- a/tests/compile-test.rs
+++ b/tests/compile-test.rs
@@ -214,6 +214,7 @@ fn run_ui_cargo(config: &mut compiletest::Config) {
                         Some("main.rs") => {},
                         _ => continue,
                     }
+                    set_var("CLIPPY_CONF_DIR", case.path());
                     let paths = compiletest::common::TestPaths {
                         file: file_path,
                         base: config.src_base.clone(),
@@ -241,9 +242,11 @@ fn run_ui_cargo(config: &mut compiletest::Config) {
     let tests = compiletest::make_tests(&config);
 
     let current_dir = env::current_dir().unwrap();
+    let conf_dir = var("CLIPPY_CONF_DIR").unwrap_or_default();
     let filter = env::var("TESTNAME").ok();
     let res = run_tests(&config, &filter, tests);
     env::set_current_dir(current_dir).unwrap();
+    set_var("CLIPPY_CONF_DIR", conf_dir);
 
     match res {
         Ok(true) => {},