Merge pull request rust-lang#334 from solson/windows

Windows support in the test suite + appveyor

Author: oli-obk

appveyor.yml

@@ -0,0 +1,35 @@
+environment:
+    global:
+        PROJECT_NAME: miri
+    matrix:
+        - TARGET: i686-pc-windows-msvc
+          MSYS2_BITS: 32
+        - TARGET: x86_64-pc-windows-msvc
+          MSYS2_BITS: 64
+
+install:
+    - set PATH=C:\Program Files\Git\mingw64\bin;%PATH%
+    - curl -sSf -o rustup-init.exe https://win.rustup.rs/
+    - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly
+    - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin;C:\Users\appveyor\.rustup\toolchains\nightly-%TARGET%\bin
+    - if defined MSYS2_BITS set PATH=%PATH%;C:\msys64\mingw%MSYS2_BITS%\bin
+    - rustc -V
+    - cargo -V
+    - rustup component add rust-src
+    - cargo install --git https://github.com/japaric/xargo.git
+    - cd xargo
+    - set RUSTFLAGS=-Zalways-encode-mir -Zmir-emit-validate=1
+    - xargo build
+    - set RUSTFLAGS=
+    - cd ..
+
+build: false
+
+test_script:
+    - set RUST_BACKTRACE=1
+    - cargo build --locked --release
+    - cargo test --locked --release
+
+notifications:
+    - provider: Email
+      on_build_success: false

miri/fn_call.rs

@@ -634,6 +634,12 @@ impl<'a, 'tcx> EvalContextExt<'tcx> for EvalContext<'a, 'tcx, super::Evaluator>
                 let bool = self.tcx.types.bool;
                 self.write_primval(dest, PrimVal::from_bool(false), bool)?;
             }
+            "std::sys::imp::c::::AddVectoredExceptionHandler" |
+            "std::sys::imp::c::::SetThreadStackGuarantee" => {
+                let usize = self.tcx.types.usize;
+                // any non zero value works for the stdlib. This is just used for stackoverflows anyway
+                self.write_primval(dest, PrimVal::Bytes(1), usize)?;
+            },
             _ => return err!(NoMirFor(path)),
         }
 

tests/compiletest.rs

@@ -50,7 +50,7 @@ fn compile_fail(sysroot: &Path, path: &str, target: &str, host: &str, fullmir: b
             // skip fullmir on nonhost
             return;
         }
-        let sysroot = Path::new(&std::env::var("HOME").unwrap())
+        let sysroot = std::env::home_dir().unwrap()
             .join(".xargo")
             .join("HOST");
         config.target_rustcflags = Some(format!("--sysroot {}", sysroot.to_str().unwrap()));
@@ -110,9 +110,10 @@ fn miri_pass(path: &str, target: &str, host: &str, fullmir: bool, opt: bool) {
             // skip fullmir on nonhost
             return;
         }
-        let sysroot = Path::new(&std::env::var("HOME").unwrap())
+        let sysroot = std::env::home_dir().unwrap()
             .join(".xargo")
             .join("HOST");
+
         flags.push(format!("--sysroot {}", sysroot.to_str().unwrap()));
     }
     if opt {
@@ -189,9 +190,9 @@ fn run_pass_miri_noopt() {
 }
 
 #[test]
+#[ignore] // FIXME: Disabled for now, as the optimizer is pretty broken and crashes...
 fn run_pass_miri_opt() {
-    // FIXME: Disabled for now, as the optimizer is pretty broken and crashes...
-    //run_pass_miri(true);
+    run_pass_miri(true);
 }
 
 #[test]

tests/run-pass-fullmir/catch.rs

@@ -1,3 +1,4 @@
+//ignore-msvc
 use std::panic::{catch_unwind, AssertUnwindSafe};
 
 fn main() {

tests/run-pass-fullmir/foreign-fn-linkname.rs

@@ -8,8 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
+//ignore-msvc
 #![feature(libc)]
 
 extern crate libc;

tests/run-pass-fullmir/format.rs

@@ -1,3 +1,4 @@
+//ignore-msvc
 fn main() {
     println!("Hello {}", 13);
 }

tests/run-pass-fullmir/from_utf8.rs

@@ -1,3 +1,4 @@
+//ignore-msvc
 fn main() {
     let _ = ::std::str::from_utf8(b"a");
 }

tests/run-pass-fullmir/hashmap.rs

@@ -1,3 +1,4 @@
+//ignore-msvc
 use std::collections::{self, HashMap};
 use std::hash::BuildHasherDefault;
 

tests/run-pass-fullmir/heap.rs

@@ -1,3 +1,4 @@
+//ignore-msvc
 #![feature(box_syntax)]
 
 fn make_box() -> Box<(i16, i16)> {

tests/run-pass-fullmir/hello.rs

@@ -1,3 +1,4 @@
+//ignore-msvc
 fn main() {
     println!("Hello, world!");
 }

tests/run-pass-fullmir/integer-ops.rs

@@ -11,6 +11,7 @@
 // FIXME: remove -Zmir-opt-level once https://github.com/rust-lang/rust/issues/43359 is fixed
 // compile-flags: -Zmir-opt-level=0
 
+//ignore-msvc
 use std::i32;
 
 pub fn main() {

tests/run-pass-fullmir/issue-15080.rs

@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+//ignore-msvc
 
 #![feature(slice_patterns)]
 

tests/run-pass-fullmir/issue-3794.rs

@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+//ignore-msvc
 #![feature(box_syntax)]
 
 trait T {

tests/run-pass-fullmir/loop-break-value.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+//ignore-msvc
+
 #![feature(never_type)]
 #![allow(unreachable_code)]
 

tests/run-pass-fullmir/move-arg-2-unique.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+//ignore-msvc
+
 #![allow(unused_features, unused_variables)]
 #![feature(box_syntax)]
 

tests/run-pass-fullmir/regions-mock-trans.rs

@@ -11,6 +11,8 @@
 // FIXME: We handle uninitialzied storage here, which currently makes validation fail.
 // compile-flags: -Zmir-emit-validate=0
 
+//ignore-msvc
+
 #![feature(libc)]
 
 #![allow(dead_code)]

tests/run-pass-fullmir/u128.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+//ignore-msvc
+
 #![feature(i128_type)]
 
 fn b<T>(t: T) -> T { t }

tests/run-pass-fullmir/unsized-tuple-impls.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+//ignore-msvc
+
 #![feature(unsized_tuple_coercion)]
 use std::mem;
 

tests/run-pass-fullmir/vecs.rs

@@ -1,3 +1,5 @@
+//ignore-msvc
+
 fn make_vec() -> Vec<u8> {
     let mut v = Vec::with_capacity(4);
     v.push(1);

tests/run-pass/issue-17877.rs

@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+//ignore-msvc
 
 #![feature(slice_patterns)]