X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=tests%2Fcompiletest.rs;h=5de5dfb4c6756719da1280558430fd2ccfcd463b;hb=31bd77c7d82dda48f7c77ecc2314bc15219969c9;hp=ff83eca1c9f0b54a6f0157d37ff28b5e70905982;hpb=336a59d2640377af3a51c1133c0394d99cbd5ef5;p=rust.git

diff --git a/tests/compiletest.rs b/tests/compiletest.rs
index ff83eca1c9f..5de5dfb4c67 100644
--- a/tests/compiletest.rs
+++ b/tests/compiletest.rs
@@ -1,121 +1,97 @@
-#![feature(slice_concat_ext, custom_test_frameworks)]
+#![feature(custom_test_frameworks)]
 // Custom test runner, to avoid libtest being wrapped around compiletest which wraps libtest.
 #![test_runner(test_runner)]
 
-use std::slice::SliceConcatExt;
-use std::path::PathBuf;
 use std::env;
+use std::path::PathBuf;
 
-use compiletest_rs as compiletest;
 use colored::*;
+use compiletest_rs as compiletest;
 
 fn miri_path() -> PathBuf {
-    if rustc_test_suite().is_some() {
-        PathBuf::from(option_env!("MIRI_PATH").unwrap())
-    } else {
-        PathBuf::from(concat!("target/", env!("PROFILE"), "/miri"))
-    }
+    PathBuf::from(option_env!("MIRI").unwrap_or(env!("CARGO_BIN_EXE_miri")))
 }
 
-fn rustc_test_suite() -> Option<PathBuf> {
-    option_env!("RUSTC_TEST_SUITE").map(PathBuf::from)
-}
+fn run_tests(mode: &str, path: &str, target: &str) {
+    let in_rustc_test_suite = option_env!("RUSTC_STAGE").is_some();
+    // Add some flags we always want.
+    let mut flags = Vec::new();
+    flags.push("--edition 2018".to_owned());
+    if in_rustc_test_suite {
+        // Less aggressive warnings to make the rustc toolstate management less painful.
+        // (We often get warnings when e.g. a feature gets stabilized or some lint gets added/improved.)
+        flags.push("-Astable-features".to_owned());
+    } else {
+        flags.push("-Dwarnings -Dunused".to_owned()); // overwrite the -Aunused in compiletest-rs
+    }
+    if let Ok(sysroot) = env::var("MIRI_SYSROOT") {
+        flags.push(format!("--sysroot {}", sysroot));
+    }
+    if let Ok(extra_flags) = env::var("MIRIFLAGS") {
+        flags.push(extra_flags);
+    }
 
-fn rustc_lib_path() -> PathBuf {
-    option_env!("RUSTC_LIB_PATH").unwrap().into()
-}
+    let flags = flags.join(" ");
+    eprintln!("   Compiler flags: {}", flags);
 
-fn mk_config(mode: &str) -> compiletest::common::ConfigWithTemp {
+    // The rest of the configuration.
     let mut config = compiletest::Config::default().tempdir();
     config.mode = mode.parse().expect("Invalid mode");
     config.rustc_path = miri_path();
-    if rustc_test_suite().is_some() {
-        config.run_lib_path = rustc_lib_path();
-        config.compile_lib_path = rustc_lib_path();
+    if let Some(lib_path) = option_env!("RUSTC_LIB_PATH") {
+        config.run_lib_path = PathBuf::from(lib_path);
+        config.compile_lib_path = PathBuf::from(lib_path);
     }
-    config.filter = env::args().nth(1);
+    config.filters = env::args().nth(1).into_iter().collect();
     config.host = get_host();
-    config
-}
-
-fn compile_fail(path: &str, target: &str, opt: bool) {
-    let opt_str = if opt { " with optimizations" } else { "" };
-    eprintln!("{}", format!(
-        "## Running compile-fail tests in {} against miri for target {}{}",
-        path,
-        target,
-        opt_str
-    ).green().bold());
-
-    let mut flags = Vec::new();
-    flags.push("-Dwarnings -Dunused".to_owned()); // overwrite the -Aunused in compiletest-rs
-    flags.push("--edition 2018".to_owned());
-    if opt {
-        // Optimizing too aggressivley makes UB detection harder, but test at least
-        // the default value.
-        // FIXME: Opt level 3 ICEs during stack trace generation.
-        flags.push("-Zmir-opt-level=1".to_owned());
-    }
-
-    let mut config = mk_config("compile-fail");
     config.src_base = PathBuf::from(path);
     config.target = target.to_owned();
-    config.target_rustcflags = Some(flags.join(" "));
+    config.target_rustcflags = Some(flags);
     compiletest::run_tests(&config);
 }
 
-fn miri_pass(path: &str, target: &str, opt: bool) {
-    let opt_str = if opt { " with optimizations" } else { "" };
-    eprintln!("{}", format!(
-        "## Running run-pass tests in {} against miri for target {}{}",
-        path,
-        target,
-        opt_str
-    ).green().bold());
+fn compile_fail(path: &str, target: &str) {
+    eprintln!(
+        "{}",
+        format!("## Running compile-fail tests in {} against miri for target {}", path, target)
+            .green()
+            .bold()
+    );
 
-    let mut flags = Vec::new();
-    flags.push("-Dwarnings -Dunused".to_owned()); // overwrite the -Aunused in compiletest-rs
-    flags.push("--edition 2018".to_owned());
-    if opt {
-        flags.push("-Zmir-opt-level=3".to_owned());
-    }
+    run_tests("compile-fail", path, target);
+}
 
-    let mut config = mk_config("ui");
-    config.src_base = PathBuf::from(path);
-    config.target = target.to_owned();
-    config.target_rustcflags = Some(flags.join(" "));
-    compiletest::run_tests(&config);
+fn miri_pass(path: &str, target: &str) {
+    eprintln!(
+        "{}",
+        format!("## Running run-pass tests in {} against miri for target {}", path, target)
+            .green()
+            .bold()
+    );
+
+    run_tests("ui", path, target);
 }
 
 fn get_host() -> String {
-    let rustc = rustc_test_suite().unwrap_or(PathBuf::from("rustc"));
-    let rustc_version = std::process::Command::new(rustc)
-        .arg("-vV")
-        .output()
-        .expect("rustc not found for -vV")
-        .stdout;
-    let rustc_version = std::str::from_utf8(&rustc_version).expect("rustc -vV is not utf8");
-    let version_meta = rustc_version::version_meta_for(&rustc_version)
-        .expect("failed to parse rustc version info");
+    let version_meta =
+        rustc_version::VersionMeta::for_command(std::process::Command::new(miri_path()))
+            .expect("failed to parse rustc version info");
     version_meta.host
 }
 
 fn get_target() -> String {
-    std::env::var("MIRI_COMPILETEST_TARGET").unwrap_or_else(|_| get_host())
-}
-
-fn run_pass_miri(opt: bool) {
-    miri_pass("tests/run-pass", &get_target(), opt);
-}
-
-fn compile_fail_miri(opt: bool) {
-    compile_fail("tests/compile-fail", &get_target(), opt);
+    env::var("MIRI_TEST_TARGET").unwrap_or_else(|_| get_host())
 }
 
 fn test_runner(_tests: &[&()]) {
-    run_pass_miri(false);
-    run_pass_miri(true);
-
-    compile_fail_miri(false);
-    compile_fail_miri(true);
+    // Add a test env var to do environment communication tests.
+    env::set_var("MIRI_ENV_VAR_TEST", "0");
+    // Let the tests know where to store temp files (they might run for a different target, which can make this hard to find).
+    env::set_var("MIRI_TEMP", env::temp_dir());
+    // Panic tests expect backtraces to be printed.
+    env::set_var("RUST_BACKTRACE", "1");
+
+    let target = get_target();
+    miri_pass("tests/run-pass", &target);
+    compile_fail("tests/compile-fail", &target);
 }