Skip to content

Commit

Permalink
Auto merge of #11228 - matthiaskrgr:fix_integration_tests2__with_test…
Browse files Browse the repository at this point in the history
…, r=flip1995

test that we correctly detect panics in intergation tests

should be merged after #11225

changelog: add test for integration tests
  • Loading branch information
bors committed Jul 26, 2023
2 parents fc13bf8 + 01b9f9d commit d446378
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 0 deletions.
1 change: 1 addition & 0 deletions .github/workflows/clippy_bors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ jobs:
- 'rust-itertools/itertools'
- 'rust-lang-nursery/failure'
- 'rust-lang/log'
- 'matthiaskrgr/clippy_ci_panic_test'

runs-on: ubuntu-latest

Expand Down
20 changes: 20 additions & 0 deletions tests/integration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,26 @@ fn integration_test() {
// debug:
eprintln!("{stderr}");

// this is an internal test to make sure we would correctly panic on a delay_span_bug
if repo_name == "matthiaskrgr/clippy_ci_panic_test" {
// we need to kind of switch around our logic here:
// if we find a panic, everything is fine, if we don't panic, SOMETHING is broken about our testing

// the repo basically just contains a delay_span_bug that forces rustc/clippy to panic:
/*
#![feature(rustc_attrs)]
#[rustc_error(delay_span_bug_from_inside_query)]
fn main() {}
*/

if stderr.find("error: internal compiler error").is_some() {
eprintln!("we saw that we intentionally panicked, yay");
return;
}

panic!("panic caused by delay_span_bug was NOT detected! Something is broken!");
}

if let Some(backtrace_start) = stderr.find("error: internal compiler error") {
static BACKTRACE_END_MSG: &str = "end of query stack";
let backtrace_end = stderr[backtrace_start..]
Expand Down

0 comments on commit d446378

Please sign in to comment.