rollup merge of rust-lang#17719 : alexcrichton/diagnose

alexcrichton · alexcrichton · commit 4c8d0334ee48 · 2014-10-02T14:49:29.000-07:00
diff --git a/src/libstd/io/process.rs b/src/libstd/io/process.rs
@@ -958,7 +958,9 @@ mod tests {
             // don't check windows magical empty-named variables
             assert!(k.is_empty() ||
                     output.as_slice()
-                          .contains(format!("{}={}", *k, *v).as_slice()));
+                          .contains(format!("{}={}", *k, *v).as_slice()),
+                    "output doesn't contain `{}={}`\n{}",
+                    k, v, output);
         }
     }
     #[cfg(target_os="android")]

Original file line number	Diff line number	Diff line change
`@@ -958,7 +958,9 @@ mod tests {`
`958`	`958`	`// don't check windows magical empty-named variables`
`959`	`959`	`assert!(k.is_empty() \|\|`
`960`	`960`	`output.as_slice()`
`961`		`- .contains(format!("{}={}", k, v).as_slice()));`
	`961`	`+ .contains(format!("{}={}", k, v).as_slice()),`
	`962`	+ "output doesn't contain `{}={}`\n{}",
	`963`	`+ k, v, output);`
`962`	`964`	`}`
`963`	`965`	`}`
`964`	`966`	`#[cfg(target_os="android")]`