test 'cargo miri run' CWD, also for subcrate in a workspace

Author: RalfJung

test-cargo-miri/Cargo.lock

@@ -1,7 +1,10 @@
+[workspace]
+members = ["subcrate"]
+
 [package]
 name = "cargo-miri-test"
 version = "0.1.0"
-authors = ["Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>"]
+authors = ["Miri Team"]
 edition = "2018"
 
 [dependencies]

test-cargo-miri/Cargo.toml

@@ -63,6 +63,11 @@ def test_cargo_miri_run():
         cargo_miri("run") + ["--bin", "cargo-miri-test", "--", "hello world", '"hello world"'],
         "stdout.ref2", "stderr.ref2"
     )
+    test("`cargo miri run` (subcrate)",
+        cargo_miri("run") + ["-p", "subcrate"],
+        "stdout.ref3", "stderr.ref3",
+        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+    )
 
 def test_cargo_miri_test():
     # rustdoc is not run on foreign targets

test-cargo-miri/run-test.py

@@ -1,4 +1,6 @@
 use byteorder::{BigEndian, ByteOrder};
+use std::env;
+use std::path::PathBuf;
 #[cfg(unix)]
 use std::io::{self, BufRead};
 
@@ -17,8 +19,12 @@ fn main() {
         eprintln!("{}", arg);
     }
 
-    // If there were no arguments, access stdin.
+    // If there were no arguments, access stdin and test working dir.
     if std::env::args().len() <= 1 {
+        let env_dir = env::current_dir().unwrap();
+        let crate_dir = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
+        assert_eq!(env_dir, crate_dir);
+
         #[cfg(unix)]
         for line in io::stdin().lock().lines() {
             let num: i32 = line.unwrap().parse().unwrap();

test-cargo-miri/src/main.rs

@@ -0,0 +1 @@
+subcrate running

test-cargo-miri/stderr.ref3

@@ -0,0 +1,9 @@
+[package]
+name = "subcrate"
+version = "0.1.0"
+authors = ["Miri Team"]
+edition = "2018"
+
+[[bin]]
+name = "subcrate"
+path = "main.rs"

test-cargo-miri/stdout.ref3

@@ -0,0 +1,11 @@
+use std::env;
+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());
+}