Skip to content

Commit cbfb654

Browse files
authored
Rollup merge of #142841 - dpaoliello:fmt-write-bloat, r=jieyouxu
Enable fmt-write-bloat for Windows Seems to be working fine for MSVC once it has the correct binary name. Addresses item in #128602 --- try-job: x86_64-mingw-* try-job: x86_64-msvc-* try-job: i686-msvc-*
2 parents 9f99a27 + 33b3ea2 commit cbfb654

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

tests/run-make/fmt-write-bloat/rmake.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,9 @@
1515
//! `NO_DEBUG_ASSERTIONS=1`). If debug assertions are disabled, then we can check for the absence of
1616
//! additional `usize` formatting and padding related symbols.
1717
18-
//@ ignore-windows
19-
// Reason:
20-
// - MSVC targets really need to parse the .pdb file (aka the debug information).
21-
// On Windows there's an API for that (dbghelp) which maybe we can use
22-
// - MinGW targets have a lot of symbols included in their runtime which we can't avoid.
23-
// We would need to make the symbols we're looking for more specific for this test to work.
2418
//@ ignore-cross-compile
2519

20+
use run_make_support::artifact_names::bin_name;
2621
use run_make_support::env::no_debug_assertions;
2722
use run_make_support::rustc;
2823
use run_make_support::symbols::any_symbol_contains;
@@ -36,5 +31,5 @@ fn main() {
3631
// otherwise, add them to the list of symbols to deny.
3732
panic_syms.extend_from_slice(&["panicking", "panic_fmt", "pad_integral", "Display"]);
3833
}
39-
assert!(!any_symbol_contains("main", &panic_syms));
34+
assert!(!any_symbol_contains(bin_name("main"), &panic_syms));
4035
}

0 commit comments

Comments
 (0)