Skip to content

Commit 239e41d

Browse files
authored
Rollup merge of #82431 - Aaron1011:fix/bug-env, r=jyn514
Set RUST_BACKTRACE=0 when running `treat-err-as-bug` tests These ensure that these tests pass regardless of what RUST_BACKTRACE is set to in the user's shell.
2 parents 8c0119d + c9d86aa commit 239e41d

File tree

4 files changed

+4
-2
lines changed

4 files changed

+4
-2
lines changed

src/test/ui/treat-err-as-bug/delay_span_bug.rs

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// error-pattern: [trigger_delay_span_bug] trigger a delay span bug
55
// normalize-stderr-test "note: .*\n\n" -> ""
66
// normalize-stderr-test "thread 'rustc' panicked.*\n" -> ""
7+
// rustc-env:RUST_BACKTRACE=0
78

89
#![feature(rustc_attrs)]
910

src/test/ui/treat-err-as-bug/delay_span_bug.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: internal compiler error: delayed span bug triggered by #[rustc_error(delay_span_bug_from_inside_query)]
2-
--> $DIR/delay_span_bug.rs:11:1
2+
--> $DIR/delay_span_bug.rs:12:1
33
|
44
LL | fn main() {}
55
| ^^^^^^^^^

src/test/ui/treat-err-as-bug/err.rs

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// error-pattern: [eval_to_allocation_raw] const-evaluating + checking `C`
55
// normalize-stderr-test "note: .*\n\n" -> ""
66
// normalize-stderr-test "thread 'rustc' panicked.*\n" -> ""
7+
// rustc-env:RUST_BACKTRACE=0
78

89
#![crate_type = "rlib"]
910

src/test/ui/treat-err-as-bug/err.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0080]: could not evaluate static initializer
2-
--> $DIR/err.rs:10:21
2+
--> $DIR/err.rs:11:21
33
|
44
LL | pub static C: u32 = 0 - 1;
55
| ^^^^^ attempt to compute `0_u32 - 1_u32`, which would overflow

0 commit comments

Comments
 (0)