test-cargo-miri: normalize slashes before comparing paths

rust-lang · Sep 12, 2020 · 9f6569c · 9f6569c
1 parent decb784
commit 9f6569c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/test-cargo-miri/src/main.rs b/test-cargo-miri/src/main.rs
@@ -1,6 +1,5 @@
 use byteorder::{BigEndian, ByteOrder};
 use std::env;
-use std::path::PathBuf;
 #[cfg(unix)]
 use std::io::{self, BufRead};
 
@@ -21,8 +20,12 @@ fn main() {
 
     // If there were no arguments, access stdin and test working dir.
     if std::env::args().len() <= 1 {
+        // CWD should be crate root.
+        // We have to normalize slashes, as the env var might be set for a different target's conventions.
         let env_dir = env::current_dir().unwrap();
-        let crate_dir = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
+        let env_dir = env_dir.to_string_lossy().replace("\\", "/");
+        let crate_dir = env::var_os("CARGO_MANIFEST_DIR").unwrap();
+        let crate_dir = crate_dir.to_string_lossy().replace("\\", "/");
         assert_eq!(env_dir, crate_dir);
 
         #[cfg(unix)]

diff --git a/test-cargo-miri/subcrate/main.rs b/test-cargo-miri/subcrate/main.rs
@@ -4,8 +4,13 @@ use std::path::PathBuf;
 fn main() {
     println!("subcrate running");
 
-    let env_dir = env::current_dir().unwrap();
-    let crate_dir = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
     // CWD should be workspace root, i.e., one level up from crate root.
-    assert_eq!(env_dir, crate_dir.parent().unwrap());
+    // We have to normalize slashes, as the env var might be set for a different target's conventions.
+    let env_dir = env::current_dir().unwrap();
+    let env_dir = env_dir.to_string_lossy().replace("\\", "/");
+    let crate_dir = env::var_os("CARGO_MANIFEST_DIR").unwrap();
+    let crate_dir = crate_dir.to_string_lossy().replace("\\", "/");
+    let crate_dir = PathBuf::from(crate_dir);
+    let crate_dir = crate_dir.parent().unwrap().to_string_lossy();
+    assert_eq!(env_dir, crate_dir);
 }
diff --git a/test-cargo-miri/subcrate/test.rs b/test-cargo-miri/subcrate/test.rs
@@ -1,11 +1,13 @@
 use std::env;
-use std::path::PathBuf;
 
 fn main() {
     println!("subcrate testing");
 
-    let env_dir = env::current_dir().unwrap();
-    let crate_dir = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
     // CWD should be crate root.
+    // We have to normalize slashes, as the env var might be set for a different target's conventions.
+    let env_dir = env::current_dir().unwrap();
+    let env_dir = env_dir.to_string_lossy().replace("\\", "/");
+    let crate_dir = env::var_os("CARGO_MANIFEST_DIR").unwrap();
+    let crate_dir = crate_dir.to_string_lossy().replace("\\", "/");
     assert_eq!(env_dir, crate_dir);
 }