Skip to content

Commit e2e33b4

Browse files
committed
Pick up clippy.toml in ui-cargo tests.
1 parent cd361a5 commit e2e33b4

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

tests/compile-test.rs

+3
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ fn run_ui_cargo(config: &mut compiletest::Config) {
214214
Some("main.rs") => {},
215215
_ => continue,
216216
}
217+
set_var("CLIPPY_CONF_DIR", case.path());
217218
let paths = compiletest::common::TestPaths {
218219
file: file_path,
219220
base: config.src_base.clone(),
@@ -241,9 +242,11 @@ fn run_ui_cargo(config: &mut compiletest::Config) {
241242
let tests = compiletest::make_tests(&config);
242243

243244
let current_dir = env::current_dir().unwrap();
245+
let conf_dir = var("CLIPPY_CONF_DIR").unwrap_or_default();
244246
let filter = env::var("TESTNAME").ok();
245247
let res = run_tests(&config, &filter, tests);
246248
env::set_current_dir(current_dir).unwrap();
249+
set_var("CLIPPY_CONF_DIR", conf_dir);
247250

248251
match res {
249252
Ok(true) => {},

0 commit comments

Comments
 (0)