Rollup merge of rust-lang#31256 - oli-obk:patch-1, r=nagisa

if the tests were run with `RUST_BACKTRACE=1 make check` this test failed. If they were run without `RUST_BACKTRACE=1` it succeeded.
Manishearth · Jan 29, 2016 · 050c587 · 050c587
2 parents cbfc5e3 + 5012d20
commit 050c587
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/test/run-pass/multi-panic.rs b/src/test/run-pass/multi-panic.rs
@@ -17,7 +17,10 @@ fn main() {
 
         panic!();
     } else {
-        let test = std::process::Command::new(&args[0]).arg("run_test").output().unwrap();
+        let test = std::process::Command::new(&args[0]).arg("run_test")
+                                                       .env_remove("RUST_BACKTRACE")
+                                                       .output()
+                                                       .unwrap();
         assert!(!test.status.success());
         let err = String::from_utf8_lossy(&test.stderr);
         let mut it = err.lines();