From e7b39e382a71882546528693ea8ed8125580fcde Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 11 Jul 2019 18:41:53 +0200 Subject: [PATCH] reenable all tests on Windows --- src/eval.rs | 11 +---------- tests/compiletest.rs | 4 +--- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/eval.rs b/src/eval.rs index dbc3282a306..faa50f91491 100644 --- a/src/eval.rs +++ b/src/eval.rs @@ -31,20 +31,11 @@ pub fn create_ecx<'mir, 'tcx: 'mir>( main_id: DefId, config: MiriConfig, ) -> InterpResult<'tcx, InterpCx<'mir, 'tcx, Evaluator<'tcx>>> { - - // FIXME(https://github.com/rust-lang/miri/pull/803): no validation on Windows. - let target_os = tcx.sess.target.target.target_os.to_lowercase(); - let validate = if target_os == "windows" { - false - } else { - config.validate - }; - let mut ecx = InterpCx::new( tcx.at(syntax::source_map::DUMMY_SP), ty::ParamEnv::reveal_all(), Evaluator::new(), - MemoryExtra::new(config.seed.map(StdRng::seed_from_u64), validate), + MemoryExtra::new(config.seed.map(StdRng::seed_from_u64), config.validate), ); let main_instance = ty::Instance::mono(ecx.tcx.tcx, main_id); diff --git a/tests/compiletest.rs b/tests/compiletest.rs index 4d799cdb542..302c080a52e 100644 --- a/tests/compiletest.rs +++ b/tests/compiletest.rs @@ -111,9 +111,7 @@ fn run_pass_miri(opt: bool) { } fn compile_fail_miri(opt: bool) { - if !cfg!(windows) { // FIXME re-enable on Windows - compile_fail("tests/compile-fail", &get_target(), opt); - } + compile_fail("tests/compile-fail", &get_target(), opt); } fn test_runner(_tests: &[&()]) { -- 2.44.0