diff options
| author | Mara Bos <m-ou.se@m-ou.se> | 2023-07-27 12:46:07 +0200 |
|---|---|---|
| committer | Mara Bos <m-ou.se@m-ou.se> | 2023-07-29 11:42:53 +0200 |
| commit | 893bb8e1ce0721524be9853c55c3b80b871eebea (patch) | |
| tree | a2827105c9e64f97aee5f6a11c361075e945e78b | |
| parent | 0e729404da1e741e26a398192fcd1614514117cf (diff) | |
| download | rust-893bb8e1ce0721524be9853c55c3b80b871eebea.tar.gz rust-893bb8e1ce0721524be9853c55c3b80b871eebea.zip | |
Fix test output.
4 files changed, 6 insertions, 4 deletions
diff --git a/src/tools/miri/tests/fail/panic/thread_local_const_drop_panic.stderr b/src/tools/miri/tests/fail/panic/thread_local_const_drop_panic.stderr index 47962e44adf..550d009607d 100644 --- a/src/tools/miri/tests/fail/panic/thread_local_const_drop_panic.stderr +++ b/src/tools/miri/tests/fail/panic/thread_local_const_drop_panic.stderr @@ -1,4 +1,5 @@ -thread $NAME panicked at 'ow', $DIR/thread_local_const_drop_panic.rs:LL:CC +thread $NAME panicked at $DIR/thread_local_const_drop_panic.rs:LL:CC: +ow fatal runtime error: thread local panicked on drop error: abnormal termination: the program aborted execution diff --git a/src/tools/miri/tests/fail/panic/thread_local_drop_panic.stderr b/src/tools/miri/tests/fail/panic/thread_local_drop_panic.stderr index 2a56e2b9c87..3d6c41faabc 100644 --- a/src/tools/miri/tests/fail/panic/thread_local_drop_panic.stderr +++ b/src/tools/miri/tests/fail/panic/thread_local_drop_panic.stderr @@ -1,4 +1,5 @@ -thread $NAME panicked at 'ow', $DIR/thread_local_drop_panic.rs:LL:CC +thread $NAME panicked at $DIR/thread_local_drop_panic.rs:LL:CC: +ow fatal runtime error: thread local panicked on drop error: abnormal termination: the program aborted execution diff --git a/tests/rustdoc-ui/ice-bug-report-url.rs b/tests/rustdoc-ui/ice-bug-report-url.rs index 7689d78d31f..a3fa819ab5e 100644 --- a/tests/rustdoc-ui/ice-bug-report-url.rs +++ b/tests/rustdoc-ui/ice-bug-report-url.rs @@ -6,7 +6,7 @@ // normalize-stderr-test "note: compiler flags.*\n\n" -> "" // normalize-stderr-test "note: rustc.*running on.*" -> "note: rustc {version} running on {platform}" -// normalize-stderr-test "thread.*panicked at .*, compiler.*" -> "thread panicked at 'aborting due to `-Z treat-err-as-bug`'" +// normalize-stderr-test "thread.*panicked at compiler.*" -> "" // normalize-stderr-test " +\d{1,}: .*\n" -> "" // normalize-stderr-test " + at .*\n" -> "" // normalize-stderr-test ".*note: Some details are omitted.*\n" -> "" diff --git a/tests/rustdoc-ui/ice-bug-report-url.stderr b/tests/rustdoc-ui/ice-bug-report-url.stderr index d454e296b38..869fcd20fac 100644 --- a/tests/rustdoc-ui/ice-bug-report-url.stderr +++ b/tests/rustdoc-ui/ice-bug-report-url.stderr @@ -4,7 +4,7 @@ error: expected one of `->`, `where`, or `{`, found `<eof>` LL | fn wrong() | ^ expected one of `->`, `where`, or `{` -thread 'rustc' panicked at compiler/rustc_errors/src/lib.rs:1711:30: + aborting due to `-Z treat-err-as-bug=1` stack backtrace: |