diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-03-03 14:13:25 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-03-03 17:02:23 +0530 |
| commit | e7cc9774b91b3172b31ad7a26ee0a374d5fcf97e (patch) | |
| tree | 134db7b4ac2c3127bd5cbf8b59fda31c46417216 | |
| parent | d7a44beb55cd1180acb3e49309ab7585cbf2503a (diff) | |
| parent | c6b66034d61581ff32effa5929de97143f4b38e3 (diff) | |
| download | rust-e7cc9774b91b3172b31ad7a26ee0a374d5fcf97e.tar.gz rust-e7cc9774b91b3172b31ad7a26ee0a374d5fcf97e.zip | |
Rollup merge of #22970 - pnkfelix:fsk-robust-backtrace-test-against-env, r=alexcrichton
Make `test/run-pass/backtrace.rs` more robust about own host environment Namely, I have been annoyed in the past when I have done `RUST_BACKTRACE=1 make check` only to discover (again) that such a trick causes this test to fail, because it assumes that the `RUST_BACKTRACE` environment variable is not set. Fix #22870
| -rw-r--r-- | src/test/run-pass/backtrace.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/test/run-pass/backtrace.rs b/src/test/run-pass/backtrace.rs index 6f76322cb77..879b3e920ab 100644 --- a/src/test/run-pass/backtrace.rs +++ b/src/test/run-pass/backtrace.rs @@ -53,7 +53,9 @@ fn runtest(me: &str) { "bad output: {}", s); // Make sure the stack trace is *not* printed - let p = template.clone().arg("fail").spawn().unwrap(); + // (Remove RUST_BACKTRACE from our own environment, in case developer + // is running `make check` with it on.) + let p = template.clone().arg("fail").env_remove("RUST_BACKTRACE").spawn().unwrap(); let out = p.wait_with_output().unwrap(); assert!(!out.status.success()); let s = str::from_utf8(&out.error).unwrap(); |