Skip to content

Commit b5ddc94

Browse files
committed
Auto merge of #833 - RalfJung:win, r=RalfJung
reenable all tests on Windows
2 parents fe9056e + f8c6eb5 commit b5ddc94

File tree

3 files changed

+4
-15
lines changed

3 files changed

+4
-15
lines changed

src/eval.rs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,11 @@ pub fn create_ecx<'mir, 'tcx: 'mir>(
3131
main_id: DefId,
3232
config: MiriConfig,
3333
) -> InterpResult<'tcx, InterpCx<'mir, 'tcx, Evaluator<'tcx>>> {
34-
35-
// FIXME(https://github.com/rust-lang/miri/pull/803): no validation on Windows.
36-
let target_os = tcx.sess.target.target.target_os.to_lowercase();
37-
let validate = if target_os == "windows" {
38-
false
39-
} else {
40-
config.validate
41-
};
42-
4334
let mut ecx = InterpCx::new(
4435
tcx.at(syntax::source_map::DUMMY_SP),
4536
ty::ParamEnv::reveal_all(),
4637
Evaluator::new(),
47-
MemoryExtra::new(config.seed.map(StdRng::seed_from_u64), validate),
38+
MemoryExtra::new(config.seed.map(StdRng::seed_from_u64), config.validate),
4839
);
4940

5041
let main_instance = ty::Instance::mono(ecx.tcx.tcx, main_id);

src/shims/foreign_items.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -725,8 +725,8 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
725725
this.write_null(dest)?;
726726
}
727727

728-
// We don't support threading.
729-
"pthread_create" => {
728+
// We don't support threading. (Also for Windows.)
729+
"pthread_create" | "CreateThread" => {
730730
return err!(Unimplemented(format!("Miri does not support threading")));
731731
}
732732

tests/compiletest.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,7 @@ fn run_pass_miri(opt: bool) {
111111
}
112112

113113
fn compile_fail_miri(opt: bool) {
114-
if !cfg!(windows) { // FIXME re-enable on Windows
115-
compile_fail("tests/compile-fail", &get_target(), opt);
116-
}
114+
compile_fail("tests/compile-fail", &get_target(), opt);
117115
}
118116

119117
fn test_runner(_tests: &[&()]) {

0 commit comments

Comments
 (0)