Get compile-test tests for configuration working

Author: Nemo157

tests/compile-test.rs

@@ -3,6 +3,9 @@
 extern crate compiletest_rs as compiletest;
 extern crate test;
 
+use std::ffi::OsStr;
+use std::fs;
+use std::error::Error;
 use std::env::{set_var, var};
 use std::path::{Path, PathBuf};
 
@@ -30,7 +33,7 @@ fn rustc_lib_path() -> PathBuf {
     option_env!("RUSTC_LIB_PATH").unwrap().into()
 }
 
-fn config(dir: &'static str, mode: &'static str) -> compiletest::Config {
+fn config(mode: &str, dir: &str) -> compiletest::Config {
     let mut config = compiletest::Config::default();
 
     let cfg_mode = mode.parse().expect("Invalid mode");
@@ -61,8 +64,38 @@ fn config(dir: &'static str, mode: &'static str) -> compiletest::Config {
     config
 }
 
-fn run_mode(dir: &'static str, mode: &'static str) {
-    compiletest::run_tests(&config(dir, mode));
+fn run_mode(mode: &str, dir: &str) {
+    compiletest::run_tests(&config(mode, dir));
+}
+
+fn run_ui_toml() -> Result<(), Box<Error>> {
+    let base = PathBuf::from("tests/ui-toml/").canonicalize()?;
+    for dir in fs::read_dir(&base)? {
+        let dir = dir?;
+        if !dir.file_type()?.is_dir() {
+            continue;
+        }
+        let dir_path = dir.path();
+        set_var("CARGO_MANIFEST_DIR", &dir_path);
+        let config = config("ui", "ui-toml");
+        for file in fs::read_dir(&dir_path)? {
+            let file = file?;
+            let file_path = file.path();
+            if !file.file_type()?.is_file() {
+                continue;
+            }
+            if file_path.extension() != Some(OsStr::new("rs")) {
+                continue;
+            }
+            let paths = compiletest::common::TestPaths {
+                file: file_path,
+                base: base.clone(),
+                relative_dir: dir_path.file_name().unwrap().into(),
+            };
+            compiletest::runtest::run(config.clone(), &paths);
+        }
+    }
+    Ok(())
 }
 
 fn prepare_env() {
@@ -76,4 +109,5 @@ fn compile_test() {
     prepare_env();
     run_mode("run-pass", "run-pass");
     run_mode("ui", "ui");
+    run_ui_toml().unwrap();
 }

tests/ui/bad_toml/clippy.toml renamed to tests/ui-toml/bad_toml/clippy.toml

@@ -0,0 +1,4 @@
+error: error reading Clippy's configuration file `$DIR/clippy.toml`: expected an equals, found an identifier at line 1
+
+error: aborting due to previous error
+

tests/ui/bad_toml/conf_bad_toml.rs renamed to tests/ui-toml/bad_toml/conf_bad_toml.rs

@@ -0,0 +1,4 @@
+error: error reading Clippy's configuration file `$DIR/clippy.toml`: invalid type: integer `42`, expected a sequence
+
+error: aborting due to previous error
+

tests/ui-toml/bad_toml/conf_bad_toml.stderr

@@ -0,0 +1,46 @@
+error: use of a blacklisted/placeholder name `toto`
+ --> $DIR/conf_french_blacklisted_name.rs:9:9
+  |
+9 | fn test(toto: ()) {}
+  |         ^^^^
+  |
+  = note: `-D blacklisted-name` implied by `-D warnings`
+
+error: use of a blacklisted/placeholder name `toto`
+  --> $DIR/conf_french_blacklisted_name.rs:12:9
+   |
+12 |     let toto = 42;
+   |         ^^^^
+
+error: use of a blacklisted/placeholder name `tata`
+  --> $DIR/conf_french_blacklisted_name.rs:13:9
+   |
+13 |     let tata = 42;
+   |         ^^^^
+
+error: use of a blacklisted/placeholder name `titi`
+  --> $DIR/conf_french_blacklisted_name.rs:14:9
+   |
+14 |     let titi = 42;
+   |         ^^^^
+
+error: use of a blacklisted/placeholder name `toto`
+  --> $DIR/conf_french_blacklisted_name.rs:20:10
+   |
+20 |         (toto, Some(tata), titi @ Some(_)) => (),
+   |          ^^^^
+
+error: use of a blacklisted/placeholder name `tata`
+  --> $DIR/conf_french_blacklisted_name.rs:20:21
+   |
+20 |         (toto, Some(tata), titi @ Some(_)) => (),
+   |                     ^^^^
+
+error: use of a blacklisted/placeholder name `titi`
+  --> $DIR/conf_french_blacklisted_name.rs:20:28
+   |
+20 |         (toto, Some(tata), titi @ Some(_)) => (),
+   |                            ^^^^
+
+error: aborting due to 7 previous errors
+