diff options
| author | bors <bors@rust-lang.org> | 2019-11-16 02:40:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-16 02:40:52 +0000 |
| commit | 1d8b6ce89e0874b5e93c9e41bfdd565c56372bb0 (patch) | |
| tree | 363c94e009f1ebf5b5b562c34caac92815a497e4 /src/libsyntax_ext | |
| parent | 82161cda33406ae8dda08b3e4afe97a44b193792 (diff) | |
| parent | ae9a62633aa0c92f826ffe0d82e9e03b41a66de1 (diff) | |
| download | rust-1d8b6ce89e0874b5e93c9e41bfdd565c56372bb0.tar.gz rust-1d8b6ce89e0874b5e93c9e41bfdd565c56372bb0.zip | |
Auto merge of #66453 - Centril:rollup-w1ohzxs, r=Centril
Rollup of 5 pull requests Successful merges: - #66350 (protect creation of destructors by a mutex) - #66407 (Add more tests for fixed ICEs) - #66415 (Add --force-run-in-process unstable option to libtest) - #66427 (Move the JSON error emitter to librustc_errors) - #66441 (libpanic_unwind for Miri: make sure we have the SEH lang items when needed) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/test_harness.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libsyntax_ext/test_harness.rs b/src/libsyntax_ext/test_harness.rs index 1492f6f575f..659780d7a43 100644 --- a/src/libsyntax_ext/test_harness.rs +++ b/src/libsyntax_ext/test_harness.rs @@ -67,7 +67,8 @@ pub fn inject( PanicStrategy::Unwind } (PanicStrategy::Abort, false) => { - span_diagnostic.err("building tests with panic=abort is not yet supported"); + span_diagnostic.err("building tests with panic=abort is not supported \ + without `-Zpanic_abort_tests`"); PanicStrategy::Unwind } (PanicStrategy::Unwind, _) => PanicStrategy::Unwind, |