Skip to content

Commit 4efaa98

Browse files
Auto merge of #142304 - Enselic:panic-main-revisions, r=<try>
tests: Add `RUST_BACKTRACE` and `-Cpanic` revisions to `panic-main.rs` test This is a regression test for #123733 (**P-high** and **regression-from-stable-to-stable**) which was [fixed by accident without a regression test](#123733 (comment)).
2 parents 39cb338 + 4c667e3 commit 4efaa98

File tree

2 files changed

+27
-17
lines changed

2 files changed

+27
-17
lines changed

src/ci/github-actions/jobs.yml

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -91,28 +91,15 @@ envs:
9191
# These jobs automatically inherit envs.pr, to avoid repeating
9292
# it in each job definition.
9393
pr:
94-
- image: mingw-check
95-
<<: *job-linux-4c
96-
- image: mingw-check-tidy
97-
continue_on_error: true
98-
<<: *job-linux-4c
99-
- image: x86_64-gnu-llvm-18
100-
env:
101-
ENABLE_GCC_CODEGEN: "1"
102-
# We are adding (temporarily) a dummy commit on the compiler
103-
READ_ONLY_SRC: "0"
104-
<<: *job-linux-16c
105-
- image: x86_64-gnu-tools
106-
<<: *job-linux-16c
94+
- image: aarch64-gnu
95+
<<: *job-aarch64-linux
10796

10897
# Jobs that run when you perform a try build (@bors try)
10998
# These jobs automatically inherit envs.try, to avoid repeating
11099
# it in each job definition.
111100
try:
112-
- image: dist-x86_64-linux
113-
env:
114-
CODEGEN_BACKENDS: llvm,cranelift
115-
<<: *job-linux-16c
101+
- image: aarch64-gnu
102+
<<: *job-aarch64-linux
116103

117104
# Main CI jobs that have to be green to merge a commit into master
118105
# These jobs automatically inherit envs.auto, to avoid repeating

tests/ui/panics/panic-main.rs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
//@ revisions: default abort-zero abort-one abort-full unwind-zero unwind-one unwind-full
2+
3+
//@[abort-zero] compile-flags: -Cpanic=abort
4+
//@[abort-zero] no-prefer-dynamic
5+
//@[abort-zero] exec-env: RUST_BACKTRACE=0
6+
7+
//@[abort-one] compile-flags: -Cpanic=abort
8+
//@[abort-one] no-prefer-dynamic
9+
//@[abort-one] exec-env: RUST_BACKTRACE=1
10+
11+
//@[abort-full] compile-flags: -Cpanic=abort
12+
//@[abort-full] no-prefer-dynamic
13+
//@[abort-full] exec-env: RUST_BACKTRACE=full
14+
15+
//@[unwind-zero] compile-flags: -Cpanic=unwind
16+
//@[unwind-zero] exec-env: RUST_BACKTRACE=0
17+
18+
//@[unwind-one] compile-flags: -Cpanic=unwind
19+
//@[unwind-one] exec-env: RUST_BACKTRACE=1
20+
21+
//@[unwind-full] compile-flags: -Cpanic=unwind
22+
//@[unwind-full] exec-env: RUST_BACKTRACE=full
23+
124
//@ run-fail
225
//@ error-pattern:moop
326
//@ ignore-emscripten no processes

0 commit comments

Comments
 (0)