diff options
| author | Aaron Hill <aa1ronham@gmail.com> | 2021-02-25 16:06:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-25 16:06:17 -0500 |
| commit | 239e41df311e5fe29138c8e0ffd8d4326e4a6be0 (patch) | |
| tree | 92b65711d510ece54eda6b321d9a3b23f2d41bed | |
| parent | 8c0119da775280a55749b868fed573f2ea59b54f (diff) | |
| parent | c9d86aae835aab2538ba0adaa876ba33e88032a0 (diff) | |
| download | rust-239e41df311e5fe29138c8e0ffd8d4326e4a6be0.tar.gz rust-239e41df311e5fe29138c8e0ffd8d4326e4a6be0.zip | |
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.
| -rw-r--r-- | src/test/ui/treat-err-as-bug/delay_span_bug.rs | 1 | ||||
| -rw-r--r-- | src/test/ui/treat-err-as-bug/delay_span_bug.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/treat-err-as-bug/err.rs | 1 | ||||
| -rw-r--r-- | src/test/ui/treat-err-as-bug/err.stderr | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/src/test/ui/treat-err-as-bug/delay_span_bug.rs b/src/test/ui/treat-err-as-bug/delay_span_bug.rs index 67846336aca..d4d44049c91 100644 --- a/src/test/ui/treat-err-as-bug/delay_span_bug.rs +++ b/src/test/ui/treat-err-as-bug/delay_span_bug.rs @@ -4,6 +4,7 @@ // error-pattern: [trigger_delay_span_bug] trigger a delay span bug // normalize-stderr-test "note: .*\n\n" -> "" // normalize-stderr-test "thread 'rustc' panicked.*\n" -> "" +// rustc-env:RUST_BACKTRACE=0 #![feature(rustc_attrs)] diff --git a/src/test/ui/treat-err-as-bug/delay_span_bug.stderr b/src/test/ui/treat-err-as-bug/delay_span_bug.stderr index ed65b69ebca..c23c2b81b97 100644 --- a/src/test/ui/treat-err-as-bug/delay_span_bug.stderr +++ b/src/test/ui/treat-err-as-bug/delay_span_bug.stderr @@ -1,5 +1,5 @@ error: internal compiler error: delayed span bug triggered by #[rustc_error(delay_span_bug_from_inside_query)] - --> $DIR/delay_span_bug.rs:11:1 + --> $DIR/delay_span_bug.rs:12:1 | LL | fn main() {} | ^^^^^^^^^ diff --git a/src/test/ui/treat-err-as-bug/err.rs b/src/test/ui/treat-err-as-bug/err.rs index 5442d858594..de3e9ed6cf9 100644 --- a/src/test/ui/treat-err-as-bug/err.rs +++ b/src/test/ui/treat-err-as-bug/err.rs @@ -4,6 +4,7 @@ // error-pattern: [eval_to_allocation_raw] const-evaluating + checking `C` // normalize-stderr-test "note: .*\n\n" -> "" // normalize-stderr-test "thread 'rustc' panicked.*\n" -> "" +// rustc-env:RUST_BACKTRACE=0 #![crate_type = "rlib"] diff --git a/src/test/ui/treat-err-as-bug/err.stderr b/src/test/ui/treat-err-as-bug/err.stderr index 61eb85c40a1..8f67571c299 100644 --- a/src/test/ui/treat-err-as-bug/err.stderr +++ b/src/test/ui/treat-err-as-bug/err.stderr @@ -1,5 +1,5 @@ error[E0080]: could not evaluate static initializer - --> $DIR/err.rs:10:21 + --> $DIR/err.rs:11:21 | LL | pub static C: u32 = 0 - 1; | ^^^^^ attempt to compute `0_u32 - 1_u32`, which would overflow |