Skip to content

Commit

Permalink
Rollup merge of #71531 - spastorino:move-treat-err-as-bug-tests-to-ui…
Browse files Browse the repository at this point in the history
…, r=oli-obk

Move treat err as bug tests to ui

cc `@oli-obk`
  • Loading branch information
m-ou-se authored Feb 8, 2021
2 parents 921ec4b + 6d9efd1 commit 35ebbe3
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 14 deletions.
7 changes: 0 additions & 7 deletions src/test/run-make-fulldeps/treat-err-as-bug/Makefile

This file was deleted.

4 changes: 0 additions & 4 deletions src/test/run-make-fulldeps/treat-err-as-bug/delay_span_bug.rs

This file was deleted.

3 changes: 0 additions & 3 deletions src/test/run-make-fulldeps/treat-err-as-bug/err.rs

This file was deleted.

11 changes: 11 additions & 0 deletions src/test/ui/treat-err-as-bug/delay_span_bug.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// compile-flags: -Ztreat-err-as-bug
// failure-status: 101
// error-pattern: aborting due to `-Z treat-err-as-bug=1`
// error-pattern: [trigger_delay_span_bug] trigger a delay span bug
// normalize-stderr-test "note: .*\n\n" -> ""
// normalize-stderr-test "thread 'rustc' panicked.*\n" -> ""

#![feature(rustc_attrs)]

#[rustc_error(delay_span_bug_from_inside_query)]
fn main() {}
11 changes: 11 additions & 0 deletions src/test/ui/treat-err-as-bug/delay_span_bug.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
error: internal compiler error: delayed span bug triggered by #[rustc_error(delay_span_bug_from_inside_query)]
--> $DIR/delay_span_bug.rs:11:1
|
LL | fn main() {}
| ^^^^^^^^^

error: internal compiler error: unexpected panic

query stack during panic:
#0 [trigger_delay_span_bug] trigger a delay span bug
end of query stack
11 changes: 11 additions & 0 deletions src/test/ui/treat-err-as-bug/err.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// compile-flags: -Ztreat-err-as-bug
// failure-status: 101
// error-pattern: aborting due to `-Z treat-err-as-bug=1`
// error-pattern: [eval_to_allocation_raw] const-evaluating + checking `C`
// normalize-stderr-test "note: .*\n\n" -> ""
// normalize-stderr-test "thread 'rustc' panicked.*\n" -> ""

#![crate_type = "rlib"]

pub static C: u32 = 0 - 1;
//~^ ERROR could not evaluate static initializer
12 changes: 12 additions & 0 deletions src/test/ui/treat-err-as-bug/err.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
error[E0080]: could not evaluate static initializer
--> $DIR/err.rs:10:21
|
LL | pub static C: u32 = 0 - 1;
| ^^^^^ attempt to compute `0_u32 - 1_u32`, which would overflow

error: internal compiler error: unexpected panic

query stack during panic:
#0 [eval_to_allocation_raw] const-evaluating + checking `C`
#1 [eval_to_allocation_raw] const-evaluating + checking `C`
end of query stack

0 comments on commit 35ebbe3

Please sign in to comment.