Use less ambiguous absolute paths in JSON

Author: matklad

src/cargo/util/machine_message.rs

@@ -1,4 +1,4 @@
-use std::path::Path;
+use std::path::{PathBuf, Path};
 use std::collections::HashMap;
 use std::borrow::Cow;
 
@@ -63,16 +63,22 @@ impl<'a> Message for BuildScript<'a> {
 
 #[derive(Serialize)]
 pub struct RunProfile<'a> {
-    pub program: Cow<'a, str>,
+    pub program:PathBuf,
     pub args: Vec<Cow<'a, str>>,
     pub env: HashMap<&'a str, Option<Cow<'a, str>>>,
     pub cwd: Option<&'a Path>,
 }
 
 impl<'a> RunProfile<'a> {
     pub fn new(process: &ProcessBuilder) -> RunProfile {
+        let program = if let Some(cwd) = process.get_cwd() {
+            cwd.join(process.get_program())
+        } else {
+            PathBuf::from(process.get_program())
+        };
+        assert!(program.is_absolute(), "Running program by relative path without cwd");
         RunProfile {
-            program: process.get_program().to_string_lossy(),
+            program: program,
             args: process.get_args().iter().map(|s| s.to_string_lossy()).collect(),
             env: process.get_envs().iter().map(|(k, v)| {
                 (k.as_str(), v.as_ref().map(|s| s.to_string_lossy()))

tests/print_run.rs

@@ -26,7 +26,7 @@ fn single_bin() {
                        .with_json(r#"
 {
   "reason": "run-profile",
-  "program": "target\/debug\/foo",
+  "program": "[..][/]foo[/]target[/]debug[/]foo",
   "env": {
     "LD_LIBRARY_PATH": "[..]",
     "CARGO_PKG_VERSION_PRE": "",