diff options
| author | bors <bors@rust-lang.org> | 2017-01-31 08:44:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-01-31 08:44:07 +0000 |
| commit | cd692cc7ece5cbabddf7798df238791d3681a490 (patch) | |
| tree | 3b02693ad6919faaefa77097320a31f26a053dfe | |
| parent | 0c85f2a1bdb01666e74cd391df630da581f12ad0 (diff) | |
| parent | e2ef630a21ae7439477642c7b629cd9beaa1811e (diff) | |
| download | rust-cd692cc7ece5cbabddf7798df238791d3681a490.tar.gz rust-cd692cc7ece5cbabddf7798df238791d3681a490.zip | |
Auto merge of #39354 - alexcrichton:less-output, r=steveklabnik
rustdoc: Suppress warnings/errors with --test Threads spawned by the test framework have their output captured by default, so for `rustdoc --test` threads this propagates that capturing to the spawned thread that we now have. Closes #39327
| -rw-r--r-- | src/librustdoc/test.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs index 1f224cac9e9..ab0ac02fd88 100644 --- a/src/librustdoc/test.rs +++ b/src/librustdoc/test.rs @@ -429,8 +429,12 @@ impl Collector { should_panic: testing::ShouldPanic::No, }, testfn: testing::DynTestFn(box move |()| { + let panic = io::set_panic(None); + let print = io::set_print(None); match { rustc_driver::in_rustc_thread(move || { + io::set_panic(panic); + io::set_print(print); runtest(&test, &cratename, cfgs, |