about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Goulet <michael@errs.io>2024-06-24 15:51:02 -0400
committerGitHub <noreply@github.com>2024-06-24 15:51:02 -0400
commit46e43984d18db0febeb1e9b8e80feebc6839edba (patch)
treedbe9b25af9eb777f9b7587fd5349c679146f89b9
parented460d2eaa38846f3e555a722566b93daecf93e5 (diff)
parent8ffb5f936a17190ad9aae442fe52c709521c5b29 (diff)
downloadrust-46e43984d18db0febeb1e9b8e80feebc6839edba.tar.gz
rust-46e43984d18db0febeb1e9b8e80feebc6839edba.zip
Rollup merge of #126413 - matthiaskrgr:crshmsg, r=oli-obk
compiletest: make the crash test error message abit more informative

r?  ```@oli-obk```
-rw-r--r--src/tools/compiletest/src/runtest.rs9
-rw-r--r--triagebot.toml3
2 files changed, 8 insertions, 4 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 72b57d91c23..1a4101e4de8 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -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."
+            ));
         }
     }
 
diff --git a/triagebot.toml b/triagebot.toml
index 3abff0f1c78..70fb14c3328 100644
--- a/triagebot.toml
+++ b/triagebot.toml
@@ -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"]