Skip to content

Commit

Permalink
rewrite short-ice in rmake format
Browse files Browse the repository at this point in the history
  • Loading branch information
Oneirical committed Jun 5, 2024
1 parent eb5e244 commit ef4835f
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 46 deletions.
10 changes: 0 additions & 10 deletions tests/run-make/short-ice/Makefile

This file was deleted.

36 changes: 0 additions & 36 deletions tests/run-make/short-ice/check.sh

This file was deleted.

39 changes: 39 additions & 0 deletions tests/run-make/short-ice/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// Backtraces in internal compiler errors used to be unbearably long, spanning
// multiple hundreds of lines. A fix was pushed in #108938, and this test gathers
// varied metrics on level 1 and full-level backtraces to check that the output
// was shortened down to an appropriate length.
// See https://github.com/rust-lang/rust/issues/107910

use run_make_support::rustc;
use std::env;

fn main() {
env::set_var("RUST_BACKTRACE", "1");
let rust_test_1 = rustc().input("src/lib.rs").arg("-Ztreat-err-as-bug=1").command_output();
env::set_var("RUST_BACKTRACE", "full");
let rust_test_2 = rustc().input("src/lib.rs").arg("-Ztreat-err-as-bug=1").command_output();
let rust_test_log_1 =
&std::str::from_utf8(rust_test_1.stdout.append(&mut rust_test_1.stderr)).unwrap();
let rust_test_log_2 =
&std::str::from_utf8(rust_test_2.stdout.append(&mut rust_test_2.stderr)).unwrap();

let rustc_query_count_full = count_lines_with(rust_test_log_2, "rustc_query_");

assert!(
rust_test_log_1.lines().count() < rust_test_log_2.lines().count()
&& count_lines_with(rust_test_log_2, "__rust_begin_short_backtrace")
== count_lines_with(rust_test_log_2, "__rust_end_short_backtrace")
&& count_lines_with(rust_test_log_1, "rustc_query_") + 5 < rustc_query_count_full
&& rustc_query_count_full > 5
);
}

fn count_lines_with(s: &str, search: &str) -> usize {
let mut count = 0;
for line in s.lines() {
if line.contains(search) {
count += 1;
}
}
count
}

0 comments on commit ef4835f

Please sign in to comment.