Skip to content

Commit

Permalink
Unrolled build for rust-lang#126413
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#126413 - matthiaskrgr:crshmsg, r=oli-obk

compiletest: make the crash test error message abit more informative

r?  ```@oli-obk```
  • Loading branch information
rust-timer committed Jun 24, 2024
2 parents d8d5732 + 8ffb5f9 commit 5c408f4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/tools/compiletest/src/runtest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -374,11 +374,12 @@ impl<'test> TestCx<'test> {

// if a test does not crash, consider it an error
if proc_res.status.success() || matches!(proc_res.status.code(), Some(1 | 0)) {
self.fatal(
"test no longer crashes/triggers ICE! Please give it a mearningful name, \
self.fatal(&format!(
"crashtest no longer crashes/triggers ICE, horray! Please give it a meaningful name, \
add a doc-comment to the start of the test explaining why it exists and \
move it to tests/ui or wherever you see fit.",
);
move it to tests/ui or wherever you see fit. Adding 'Fixes #<issueNr>' to your PR description \
ensures that the corresponding ticket is auto-closed upon merge."
));
}
}

Expand Down
3 changes: 3 additions & 0 deletions triagebot.toml
Original file line number Diff line number Diff line change
Expand Up @@ -811,6 +811,9 @@ If appropriate, please update `CONFIG_CHANGE_HISTORY` in `src/bootstrap/src/util
[mentions."src/bootstrap/src/core/build_steps/llvm.rs"]
message = "This PR changes how LLVM is built. Consider updating src/bootstrap/download-ci-llvm-stamp."

[mentions."test/crashes"]
message = "This PR changes a file inside `tests/crashes`. If a crash was fixed, please move into the correspondig `ui` subdir and add 'Fixes #<issueNr>' to the pr description to autoclose the issue upon merge."

[mentions."tests/ui/deriving/deriving-all-codegen.stdout"]
message = "Changes to the code generated for builtin derived traits."
cc = ["@nnethercote"]
Expand Down

0 comments on commit 5c408f4

Please sign in to comment.