diff --git a/src/eval.rs b/src/eval.rs index c7ce51a83f4..5d8d332fcd9 100644 --- a/src/eval.rs +++ b/src/eval.rs @@ -443,8 +443,8 @@ mod tests { fn windows_argv0_no_escape() { // Ensure that a trailing backslash in argv[0] is not escaped. let cmd = String::from_utf16_lossy(&args_to_utf16_command_string( - [r"C:\Program Files\", "arg1"].iter(), + [r"C:\Program Files\", "arg1", "arg 2", "arg \" 3"].iter(), )); - assert_eq!(cmd.trim_end_matches("\0"), r#""C:\Program Files\" arg1"#); + assert_eq!(cmd.trim_end_matches("\0"), r#""C:\Program Files\" arg1 "arg 2" "arg \" 3""#); } } diff --git a/test-cargo-miri/run-test.py b/test-cargo-miri/run-test.py index 3bc37b236b3..18671b2e29d 100755 --- a/test-cargo-miri/run-test.py +++ b/test-cargo-miri/run-test.py @@ -94,7 +94,7 @@ def test_cargo_miri_run(): # so keep it set ) test("`cargo miri run` (with arguments and target)", - cargo_miri("run") + ["--bin", "cargo-miri-test", "--", "hello world", '"hello world"'], + cargo_miri("run") + ["--bin", "cargo-miri-test", "--", "hello world", '"hello world"', r'he\\llo\"world'], "run.args.stdout.ref", "run.args.stderr.ref", ) test("`cargo miri r` (subcrate, no isolation)", diff --git a/test-cargo-miri/run.args.stderr.ref b/test-cargo-miri/run.args.stderr.ref index 8226b1b7cde..01bb8952322 100644 --- a/test-cargo-miri/run.args.stderr.ref +++ b/test-cargo-miri/run.args.stderr.ref @@ -1,3 +1,4 @@ main hello world "hello world" +he\\llo\"world