Auto merge of #1261 - RalfJung:cross-gnu, r=RalfJung

cross-running windows-gnu should now also work Fixes #1198
rust-lang · Mar 25, 2020 · c6e8838 · c6e8838
2 parents a84d8a8 + 8ffbca7
commit c6e8838
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/bin/cargo-miri.rs b/src/bin/cargo-miri.rs
@@ -6,7 +6,7 @@ use std::ops::Not;
 use std::path::{Path, PathBuf};
 use std::process::Command;
 
-const XARGO_MIN_VERSION: (u32, u32, u32) = (0, 3, 19);
+const XARGO_MIN_VERSION: (u32, u32, u32) = (0, 3, 20);
 
 const CARGO_MIRI_HELP: &str = r#"Interprets bin crates and tests in Miri
 

diff --git a/travis.sh b/travis.sh
@@ -44,4 +44,6 @@ if [ "$TRAVIS_OS_NAME" == linux ]; then
 elif [ "$TRAVIS_OS_NAME" == osx ]; then
   # cross-test 64bit Windows from macOS
   MIRI_TEST_TARGET=x86_64-pc-windows-msvc run_tests
+  # cross-test 32bit GNU Windows from macOS
+  MIRI_TEST_TARGET=i686-pc-windows-gnu run_tests
 fi