rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

bump compiletest so that we can share the tempdir() call

Browse Source
This commit is contained in:
Ralf Jung
2018-11-09 14:04:22 +01:00
parent 97302e86c2
commit 54307cd888
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -46,5 +46,5 @@ cargo_miri = ["cargo_metadata"]
rustc_tests = [] rustc_tests = []
[dev-dependencies] [dev-dependencies]
compiletest_rs = { version = "0.3.16", features = ["tmp"] } compiletest_rs = { version = "0.3.17", features = ["tmp"] }
colored = "1.6" colored = "1.6"

8
tests/compiletest.rs
View File

@@ -29,8 +29,8 @@ fn have_fullmir() -> bool {
std::env::var("MIRI_SYSROOT").is_ok() || rustc_test_suite().is_some() std::env::var("MIRI_SYSROOT").is_ok() || rustc_test_suite().is_some()
} }
fn mk_config(mode: &str) -> compiletest::Config { fn mk_config(mode: &str) -> compiletest::common::ConfigWithTemp {
let mut config = compiletest::Config::default(); let mut config = compiletest::Config::default().tempdir();
config.mode = mode.parse().expect("Invalid mode"); config.mode = mode.parse().expect("Invalid mode");
config.rustc_path = miri_path(); config.rustc_path = miri_path();
if rustc_test_suite().is_some() { if rustc_test_suite().is_some() {
@@ -74,7 +74,7 @@ fn compile_fail(sysroot: &Path, path: &str, target: &str, host: &str, need_fullm
config.target = target.to_owned(); config.target = target.to_owned();
config.host = host.to_owned(); config.host = host.to_owned();
config.target_rustcflags = Some(flags.join(" ")); config.target_rustcflags = Some(flags.join(" "));
compiletest::run_tests(&config.tempdir()); // FIXME: `tempdir` can be done by `mk_config` once `ConfigWithTemp` is exposed as type from compiletest compiletest::run_tests(&config);
} }
fn miri_pass(sysroot: &Path, path: &str, target: &str, host: &str, need_fullmir: bool, opt: bool) { fn miri_pass(sysroot: &Path, path: &str, target: &str, host: &str, need_fullmir: bool, opt: bool) {
@@ -107,7 +107,7 @@ fn miri_pass(sysroot: &Path, path: &str, target: &str, host: &str, need_fullmir:
config.target = target.to_owned(); config.target = target.to_owned();
config.host = host.to_owned(); config.host = host.to_owned();
config.target_rustcflags = Some(flags.join(" ")); config.target_rustcflags = Some(flags.join(" "));
compiletest::run_tests(&config.tempdir()); // FIXME: `tempdir` can be done by `mk_config` once `ConfigWithTemp` is exposed as type from compiletest compiletest::run_tests(&config);
} }
fn is_target_dir<P: Into<PathBuf>>(path: P) -> bool { fn is_target_dir<P: Into<PathBuf>>(path: P) -> bool {