From 6800111c8edcaaf705f16a8b2f4b0497eeea1c52 Mon Sep 17 00:00:00 2001 From: mcarton Date: Mon, 3 Oct 2016 17:49:41 +0200 Subject: [PATCH] Move all `*.toml` test files to `tests/aux` --- tests/{compile-fail => aux}/conf_french_blacklisted_name.toml | 0 tests/{compile-fail => aux}/conf_unknown_key.toml | 0 .../conf_unknown_key.toml => aux/conf_whitelisted.toml} | 0 tests/compile-fail/conf_french_blacklisted_name.rs | 2 +- tests/compile-fail/conf_non_existant.rs | 2 +- tests/compile-fail/conf_unknown_key.rs | 2 +- tests/run-pass/conf_unknown_key.rs | 4 ---- tests/run-pass/conf_whitelisted.rs | 4 ++++ 8 files changed, 7 insertions(+), 7 deletions(-) rename tests/{compile-fail => aux}/conf_french_blacklisted_name.toml (100%) rename tests/{compile-fail => aux}/conf_unknown_key.toml (100%) rename tests/{run-pass/conf_unknown_key.toml => aux/conf_whitelisted.toml} (100%) delete mode 100644 tests/run-pass/conf_unknown_key.rs create mode 100644 tests/run-pass/conf_whitelisted.rs diff --git a/tests/compile-fail/conf_french_blacklisted_name.toml b/tests/aux/conf_french_blacklisted_name.toml similarity index 100% rename from tests/compile-fail/conf_french_blacklisted_name.toml rename to tests/aux/conf_french_blacklisted_name.toml diff --git a/tests/compile-fail/conf_unknown_key.toml b/tests/aux/conf_unknown_key.toml similarity index 100% rename from tests/compile-fail/conf_unknown_key.toml rename to tests/aux/conf_unknown_key.toml diff --git a/tests/run-pass/conf_unknown_key.toml b/tests/aux/conf_whitelisted.toml similarity index 100% rename from tests/run-pass/conf_unknown_key.toml rename to tests/aux/conf_whitelisted.toml diff --git a/tests/compile-fail/conf_french_blacklisted_name.rs b/tests/compile-fail/conf_french_blacklisted_name.rs index b7e29eeef1f..716b338e1a4 100644 --- a/tests/compile-fail/conf_french_blacklisted_name.rs +++ b/tests/compile-fail/conf_french_blacklisted_name.rs @@ -1,5 +1,5 @@ #![feature(plugin)] -#![plugin(clippy(conf_file="./tests/compile-fail/conf_french_blacklisted_name.toml"))] +#![plugin(clippy(conf_file="./tests/aux/conf_french_blacklisted_name.toml"))] #![allow(dead_code)] #![allow(single_match)] diff --git a/tests/compile-fail/conf_non_existant.rs b/tests/compile-fail/conf_non_existant.rs index cf1024705ca..0a31fb16147 100644 --- a/tests/compile-fail/conf_non_existant.rs +++ b/tests/compile-fail/conf_non_existant.rs @@ -1,6 +1,6 @@ // error-pattern: error reading Clippy's configuration file #![feature(plugin)] -#![plugin(clippy(conf_file="./tests/compile-fail/non_existant_conf.toml"))] +#![plugin(clippy(conf_file="./tests/aux/non_existant_conf.toml"))] fn main() {} diff --git a/tests/compile-fail/conf_unknown_key.rs b/tests/compile-fail/conf_unknown_key.rs index 02131d94d52..e6041d8ed1c 100644 --- a/tests/compile-fail/conf_unknown_key.rs +++ b/tests/compile-fail/conf_unknown_key.rs @@ -1,6 +1,6 @@ // error-pattern: error reading Clippy's configuration file: unknown key `foobar` #![feature(plugin)] -#![plugin(clippy(conf_file="./tests/compile-fail/conf_unknown_key.toml"))] +#![plugin(clippy(conf_file="./tests/aux/conf_unknown_key.toml"))] fn main() {} diff --git a/tests/run-pass/conf_unknown_key.rs b/tests/run-pass/conf_unknown_key.rs deleted file mode 100644 index bb186d47630..00000000000 --- a/tests/run-pass/conf_unknown_key.rs +++ /dev/null @@ -1,4 +0,0 @@ -#![feature(plugin)] -#![plugin(clippy(conf_file="./tests/run-pass/conf_unknown_key.toml"))] - -fn main() {} diff --git a/tests/run-pass/conf_whitelisted.rs b/tests/run-pass/conf_whitelisted.rs new file mode 100644 index 00000000000..9b4bb4155d3 --- /dev/null +++ b/tests/run-pass/conf_whitelisted.rs @@ -0,0 +1,4 @@ +#![feature(plugin)] +#![plugin(clippy(conf_file="./tests/aux/conf_whitelisted.toml"))] + +fn main() {}