Skip to content

Commit 9e45323

Browse files
committed
Enable short-ice for Windows
1 parent 42245d3 commit 9e45323

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

tests/run-make/short-ice/rmake.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
// See https://github.com/rust-lang/rust/issues/107910
66

77
//@ needs-target-std
8-
//@ ignore-windows
9-
// Reason: the assert_eq! on line 32 fails, as error output on Windows is different.
108

119
use run_make_support::rustc;
1210

@@ -29,10 +27,16 @@ fn main() {
2927

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

32-
assert!(rust_test_log_1.lines().count() < rust_test_log_2.lines().count());
30+
assert!(
31+
rust_test_log_1.lines().count() < rust_test_log_2.lines().count(),
32+
"Short backtrace should be shorter than full backtrace.\nShort backtrace:\n\
33+
{rust_test_log_1}\nFull backtrace:\n{rust_test_log_2}"
34+
);
3335
assert_eq!(
3436
count_lines_with(rust_test_log_2, "__rust_begin_short_backtrace"),
35-
count_lines_with(rust_test_log_2, "__rust_end_short_backtrace")
37+
count_lines_with(rust_test_log_2, "__rust_end_short_backtrace"),
38+
"Full backtrace should contain the short backtrace markers.\nFull backtrace:\n\
39+
{rust_test_log_2}"
3640
);
3741
assert!(count_lines_with(rust_test_log_1, "rustc_query_") + 5 < rustc_query_count_full);
3842
assert!(rustc_query_count_full > 5);

0 commit comments

Comments
 (0)