Commit 4af75b2

authored

Rollup merge of #142844 - dpaoliello:short-ice, r=jieyouxu

Enable short-ice for Windows Works fine for x64 without modifications. x86 MSVC is still failing. Addresses item in #128602 --- try-job: x86_64-mingw-* try-job: x86_64-msvc-* try-job: i686-msvc-*

2 parents 2ad6272 + 4c7f054 commit 4af75b2Copy full SHA for 4af75b2

File tree

1 file changed

+11

-4

lines changed

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

1 file changed

+11

-4

lines changed

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

Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,9 @@`
`5`	`5`	`// See https://github.com/rust-lang/rust/issues/107910`
`6`	`6`
`7`	`7`	`//@ needs-target-std`
`8`		`-//@ ignore-windows`
`9`		`-// Reason: the assert_eq! on line 32 fails, as error output on Windows is different.`
	`8`	`+//@ ignore-i686-pc-windows-msvc`
	`9`	`+// Reason: the assert_eq! on line 37 fails, almost seems like it missing debug info?`
	`10`	`+// Haven't been able to reproduce locally, but it happens on CI.`
`10`	`11`
`11`	`12`	`use run_make_support::rustc;`
`12`	`13`
`@@ -29,10 +30,16 @@ fn main() {`
`29`	`30`
`30`	`31`	`let rustc_query_count_full = count_lines_with(rust_test_log_2, "rustc_query_");`
`31`	`32`
`32`		`- assert!(rust_test_log_1.lines().count() < rust_test_log_2.lines().count());`
	`33`	`+ assert!(`
	`34`	`+ rust_test_log_1.lines().count() < rust_test_log_2.lines().count(),`
	`35`	`+ "Short backtrace should be shorter than full backtrace.\nShort backtrace:\n\`
	`36`	`+ {rust_test_log_1}\nFull backtrace:\n{rust_test_log_2}"`
	`37`	`+ );`
`33`	`38`	`assert_eq!(`
`34`	`39`	`count_lines_with(rust_test_log_2, "__rust_begin_short_backtrace"),`
`35`		`- count_lines_with(rust_test_log_2, "__rust_end_short_backtrace")`
	`40`	`+ count_lines_with(rust_test_log_2, "__rust_end_short_backtrace"),`
	`41`	`+ "Full backtrace should contain the short backtrace markers.\nFull backtrace:\n\`
	`42`	`+ {rust_test_log_2}"`
`36`	`43`	`);`
`37`	`44`	`assert!(count_lines_with(rust_test_log_1, "rustc_query_") + 5 < rustc_query_count_full);`
`38`	`45`	`assert!(rustc_query_count_full > 5);`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 4af75b2

File tree

1 file changed

1 file changed

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

0 commit comments