-#![feature(slice_concat_ext)]
+#![feature(custom_test_frameworks)]
+// Custom test runner, to avoid libtest being wrapped around compiletest which wraps libtest.
+#![test_runner(test_runner)]
-extern crate compiletest_rs as compiletest;
-
-use std::slice::SliceConcatExt;
-use std::path::{PathBuf, Path};
-use std::io::Write;
use std::env;
+use std::path::PathBuf;
-macro_rules! eprintln {
- ($($arg:tt)*) => {
- let stderr = std::io::stderr();
- writeln!(stderr.lock(), $($arg)*).unwrap();
- }
-}
+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"))
- }
-}
-
-fn rustc_test_suite() -> Option<PathBuf> {
- option_env!("RUSTC_TEST_SUITE").map(PathBuf::from)
+ PathBuf::from(option_env!("MIRI").unwrap_or(env!("CARGO_BIN_EXE_miri")))
}
-fn rustc_lib_path() -> PathBuf {
- option_env!("RUSTC_LIB_PATH").unwrap().into()
-}
-
-fn compile_fail(sysroot: &Path, path: &str, target: &str, host: &str, fullmir: bool) {
- eprintln!(
- "## Running compile-fail tests in {} against miri for target {}",
- path,
- target
- );
- let mut config = compiletest::Config::default().tempdir();
- config.mode = "compile-fail".parse().expect("Invalid mode");
- config.rustc_path = miri_path();
+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();
- if rustc_test_suite().is_some() {
- config.run_lib_path = rustc_lib_path();
- config.compile_lib_path = rustc_lib_path();
- }
- // if we are building as part of the rustc test suite, we already have fullmir for everything
- if fullmir && rustc_test_suite().is_none() {
- if host != target {
- // skip fullmir on nonhost
- return;
- }
- let sysroot = Path::new(&std::env::var("HOME").unwrap())
- .join(".xargo")
- .join("HOST");
- config.target_rustcflags = Some(format!("--sysroot {}", sysroot.to_str().unwrap()));
- config.src_base = PathBuf::from(path.to_string());
+ 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 {
- config.target_rustcflags = Some(format!("--sysroot {}", sysroot.to_str().unwrap()));
- config.src_base = PathBuf::from(path.to_string());
+ flags.push("-Dwarnings -Dunused".to_owned()); // overwrite the -Aunused in compiletest-rs
}
- flags.push("-Zmir-emit-validate=1".to_owned());
- config.target_rustcflags = Some(flags.join(" "));
- config.target = target.to_owned();
- compiletest::run_tests(&config);
-}
-
-fn run_pass(path: &str) {
- eprintln!("## Running run-pass tests in {} against rustc", path);
- let mut config = compiletest::Config::default().tempdir();
- config.mode = "run-pass".parse().expect("Invalid mode");
- config.src_base = PathBuf::from(path);
- if let Some(rustc_path) = rustc_test_suite() {
- config.rustc_path = rustc_path;
- config.run_lib_path = rustc_lib_path();
- config.compile_lib_path = rustc_lib_path();
- config.target_rustcflags = Some(format!("-Dwarnings --sysroot {}", get_sysroot().display()));
- } else {
- config.target_rustcflags = Some("-Dwarnings".to_owned());
+ 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);
}
- config.host_rustcflags = Some("-Dwarnings".to_string());
- compiletest::run_tests(&config);
-}
-fn miri_pass(path: &str, target: &str, host: &str, fullmir: bool, opt: bool) {
- let opt_str = if opt { " with optimizations" } else { "" };
- eprintln!(
- "## Running run-pass tests in {} against miri for target {}{}",
- path,
- target,
- opt_str
- );
+ let flags = flags.join(" ");
+ eprintln!(" Compiler flags: {}", flags);
+
+ // The rest of the configuration.
let mut config = compiletest::Config::default().tempdir();
- config.mode = "ui".parse().expect("Invalid mode");
- config.src_base = PathBuf::from(path);
- config.target = target.to_owned();
- config.host = host.to_owned();
+ 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();
- }
- let mut flags = Vec::new();
- // Control miri logging. This is okay despite concurrent test execution as all tests
- // will set this env var to the same value.
- env::set_var("MIRI_LOG", "warn");
- // if we are building as part of the rustc test suite, we already have fullmir for everything
- if fullmir && rustc_test_suite().is_none() {
- if host != target {
- // skip fullmir on nonhost
- return;
- }
- let sysroot = Path::new(&std::env::var("HOME").unwrap())
- .join(".xargo")
- .join("HOST");
- flags.push(format!("--sysroot {}", sysroot.to_str().unwrap()));
+ 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);
}
- if opt {
- flags.push("-Zmir-opt-level=3".to_owned());
- } else {
- flags.push("-Zmir-opt-level=0".to_owned());
- // For now, only validate without optimizations. Inlining breaks validation.
- flags.push("-Zmir-emit-validate=1".to_owned());
- }
- if target == host {
- flags.push("--miri_host_target".to_owned());
- }
- config.target_rustcflags = Some(flags.join(" "));
+ config.filters = env::args().nth(1).into_iter().collect();
+ config.host = get_host();
+ config.src_base = PathBuf::from(path);
+ config.target = target.to_owned();
+ config.target_rustcflags = Some(flags);
compiletest::run_tests(&config);
}
-fn is_target_dir<P: Into<PathBuf>>(path: P) -> bool {
- let mut path = path.into();
- path.push("lib");
- path.metadata().map(|m| m.is_dir()).unwrap_or(false)
-}
-
-fn for_all_targets<F: FnMut(String)>(sysroot: &Path, mut f: F) {
- let target_dir = sysroot.join("lib").join("rustlib");
- for entry in std::fs::read_dir(target_dir).expect("invalid sysroot") {
- let entry = entry.unwrap();
- if !is_target_dir(entry.path()) {
- continue;
- }
- let target = entry.file_name().into_string().unwrap();
- f(target);
- }
-}
+fn compile_fail(path: &str, target: &str) {
+ eprintln!(
+ "{}",
+ format!("## Running compile-fail tests in {} against miri for target {}", path, target)
+ .green()
+ .bold()
+ );
-fn get_sysroot() -> PathBuf {
- let sysroot = std::env::var("MIRI_SYSROOT").unwrap_or_else(|_| {
- let sysroot = std::process::Command::new("rustc")
- .arg("--print")
- .arg("sysroot")
- .output()
- .expect("rustc not found")
- .stdout;
- String::from_utf8(sysroot).expect("sysroot is not utf8")
- });
- PathBuf::from(sysroot.trim())
+ run_tests("compile-fail", path, target);
}
-fn get_host() -> String {
- let rustc = rustc_test_suite().unwrap_or(PathBuf::from("rustc"));
- println!("using rustc at {}", rustc.display());
- let host = std::process::Command::new(rustc)
- .arg("-vV")
- .output()
- .expect("rustc not found for -vV")
- .stdout;
- let host = std::str::from_utf8(&host).expect("sysroot is not utf8");
- let host = host.split("\nhost: ").nth(1).expect(
- "no host: part in rustc -vV",
+fn miri_pass(path: &str, target: &str) {
+ eprintln!(
+ "{}",
+ format!("## Running run-pass tests in {} against miri for target {}", path, target)
+ .green()
+ .bold()
);
- let host = host.split('\n').next().expect("no \n after host");
- String::from(host)
-}
-
-fn run_pass_miri(opt: bool) {
- let sysroot = get_sysroot();
- let host = get_host();
- for_all_targets(&sysroot, |target| {
- miri_pass("tests/run-pass", &target, &host, false, opt);
- });
- miri_pass("tests/run-pass-fullmir", &host, &host, true, opt);
+ run_tests("ui", path, target);
}
-#[test]
-fn run_pass_miri_noopt() {
- run_pass_miri(false);
-}
-
-#[test]
-fn run_pass_miri_opt() {
- // FIXME: Disabled for now, as the optimizer is pretty broken and crashes...
- //run_pass_miri(true);
+fn get_host() -> String {
+ let version_meta =
+ rustc_version::VersionMeta::for_command(std::process::Command::new(miri_path()))
+ .expect("failed to parse rustc version info");
+ version_meta.host
}
-#[test]
-fn run_pass_rustc() {
- run_pass("tests/run-pass");
- run_pass("tests/run-pass-fullmir");
+fn get_target() -> String {
+ env::var("MIRI_TEST_TARGET").unwrap_or_else(|_| get_host())
}
-#[test]
-fn compile_fail_miri() {
- let sysroot = get_sysroot();
- let host = get_host();
+fn test_runner(_tests: &[&()]) {
+ // 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");
- for_all_targets(&sysroot, |target| {
- compile_fail(&sysroot, "tests/compile-fail", &target, &host, false);
- });
- compile_fail(&sysroot, "tests/compile-fail-fullmir", &host, &host, true);
+ let target = get_target();
+ miri_pass("tests/run-pass", &target);
+ compile_fail("tests/compile-fail", &target);
}
projects / rust.git / blobdiff