Change explicit_counter_loop's message to add parentheses if necessary

[rust.git] / tests / compile-test.rs

diff --git a/tests/compile-test.rs b/tests/compile-test.rs
index 51ab6aee3a408aac197e96260edd2664b34cfd1c..b6a4beff0469864781aeadb9bf019fe9f13c6eb9 100644 (file)
--- a/tests/compile-test.rs
+++ b/tests/compile-test.rs
@@ -1,10 +1,13 @@
 #![feature(test)]
 
-extern crate compiletest_rs as compiletest;
+use compiletest_rs as compiletest;
 extern crate test;
 
-use std::path::{PathBuf, Path};
 use std::env::{set_var, var};
+use std::ffi::OsStr;
+use std::fs;
+use std::io;
+use std::path::{Path, PathBuf};
 
 fn clippy_driver_path() -> PathBuf {
     if let Some(path) = option_env!("CLIPPY_DRIVER_PATH") {
@@ -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: PathBuf) -> compiletest::Config {
     let mut config = compiletest::Config::default();
 
     let cfg_mode = mode.parse().expect("Invalid mode");
@@ -43,50 +46,93 @@ fn config(dir: &'static str, mode: &'static str) -> compiletest::Config {
         config.run_lib_path = rustc_lib_path();
         config.compile_lib_path = rustc_lib_path();
     }
-    config.target_rustcflags = Some(format!("-L {0} -L {0}/deps -Dwarnings", host_libs().display()));
+    config.target_rustcflags = Some(format!(
+        "-L {0} -L {0}/deps -Dwarnings -Zui-testing",
+        host_libs().display()
+    ));
 
     config.mode = cfg_mode;
-    config.build_base = {
+    config.build_base = if rustc_test_suite().is_some() {
+        // we don't need access to the stderr files on travis
+        let mut path = PathBuf::from(env!("OUT_DIR"));
+        path.push("test_build_base");
+        path
+    } else {
         let mut path = std::env::current_dir().unwrap();
         path.push("target/debug/test_build_base");
         path
     };
-    config.src_base = PathBuf::from(format!("tests/{}", dir));
+    config.src_base = dir;
     config.rustc_path = clippy_driver_path();
     config
 }
 
-fn run_mode(dir: &'static str, mode: &'static str) {
-    compiletest::run_tests(&config(dir, mode));
+fn run_mode(mode: &str, dir: PathBuf) {
+    let cfg = config(mode, dir);
+    // clean rmeta data, otherwise "cargo check; cargo test" fails (#2896)
+    cfg.clean_rmeta();
+    compiletest::run_tests(&cfg);
+}
+
+fn run_ui_toml_tests(config: &compiletest::Config, mut tests: Vec<test::TestDescAndFn>) -> Result<bool, io::Error> {
+    let mut result = true;
+    let opts = compiletest::test_opts(config);
+    for dir in fs::read_dir(&config.src_base)? {
+        let dir = dir?;
+        if !dir.file_type()?.is_dir() {
+            continue;
+        }
+        let dir_path = dir.path();
+        set_var("CARGO_MANIFEST_DIR", &dir_path);
+        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: config.src_base.clone(),
+                relative_dir: dir_path.file_name().unwrap().into(),
+            };
+            let test_name = compiletest::make_test_name(&config, &paths);
+            let index = tests
+                .iter()
+                .position(|test| test.desc.name == test_name)
+                .expect("The test should be in there");
+            result &= test::run_tests_console(&opts, vec![tests.swap_remove(index)])?;
+        }
+    }
+    Ok(result)
+}
+
+fn run_ui_toml() {
+    let path = PathBuf::from("tests/ui-toml").canonicalize().unwrap();
+    let config = config("ui", path);
+    let tests = compiletest::make_tests(&config);
+
+    let res = run_ui_toml_tests(&config, tests);
+    match res {
+        Ok(true) => {},
+        Ok(false) => panic!("Some tests failed"),
+        Err(e) => {
+            println!("I/O failure during tests: {:?}", e);
+        },
+    }
 }
 
 fn prepare_env() {
     set_var("CLIPPY_DISABLE_DOCS_LINKS", "true");
     set_var("CLIPPY_TESTS", "true");
-    set_var("RUST_BACKTRACE", "0");
+    //set_var("RUST_BACKTRACE", "0");
 }
 
 #[test]
 fn compile_test() {
     prepare_env();
-    run_mode("run-pass", "run-pass");
-    run_mode("ui", "ui");
-}
-
-#[test]
-fn dogfood() {
-    prepare_env();
-    let files = ["src/main.rs", "src/driver.rs", "src/lib.rs", "clippy_lints/src/lib.rs"];
-    let mut config = config("dogfood", "ui");
-    config.target_rustcflags = config.target_rustcflags.map(|flags| format!("{} -Dclippy -Dclippy_pedantic -Dclippy_internal", flags));
-
-    for file in &files {
-        let paths = test::TestPaths {
-            base: PathBuf::new(),
-            file: PathBuf::from(file),
-            relative_dir: PathBuf::new(),
-        };
-
-        compiletest::runtest::run(config.clone(), &paths);
-    }
+    run_mode("ui", "tests/ui".into());
+    run_ui_toml();
 }