Skip to content

Commit 3905360

Browse files
authored
Rollup merge of #157503 - jieyouxu:jieyouxu/fix/pretty-std-cdb, r=Kobzol
Disable `tests/debuginfo/pretty-std.rs` `OsString` cdb check ## Summary Since approx. Windows SDK 20348, the corresponding cdb (and/or its underlying WinDbg engine) changed or regressed the `OsStr`/`OsString` visualization, and no longer renders the emoji. Since approx. SDK/cdb 26100, the output formatting of the string containing UTF-8 (i.e. the multi-byte emoji grapheme) seems to have further regressed (e.g. the end quotation mark is no longer shown and command output becomes garbled). Relevant issues: * #88840 * #148743 * #88796 This was failing for me locally on host Windows MSVC under `./x test tests/debuginfo`. And the issues re. this case failing has been open for a long while and have not been addressed, so I propose disabling this case. I believe this is either a regression or a change in cdb and/or the underlying WinDbg. I have not bothered filing such a cdb bug report, I don't know enough about this. The check was actually relaxed to not require the emoji to be rendered properly in the output in #88842, but I feel like that regressed the original intention of the check (that multi-byte Unicode graphemes are properly rendered), so I just restored the original checks but commented them out. Maybe r? @wesleywiser (or compiler)
2 parents d591a32 + d5435fc commit 3905360

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

tests/debuginfo/pretty-std.rs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,15 @@
109109
//@ cdb-check: [10] : 103 'g' [Type: char]
110110
//@ cdb-check: [11] : 33 '!' [Type: char]
111111

112-
//@ cdb-command: dx os_string
113-
// NOTE: OSString is WTF-8 encoded which Windows debuggers don't understand. Verify the UTF-8
114-
// portion displays correctly.
115-
//@ cdb-check:os_string : "IAMA OS string [...]" [Type: std::ffi::os_str::OsString]
116-
//@ cdb-check: [<Raw View>] [Type: std::ffi::os_str::OsString]
117-
//@ cdb-check: [chars] : "IAMA OS string [...]"
112+
// FIXME(#88840, #148743, #88796): since approx. Windows SDK 20348, the corresponding cdb (and/or
113+
// its underlying WinDbg engine) changed or regressed the `OsStr`/`OsString` visualization, and no
114+
// longer renders the emoji. Since approx. 26100, the output formatting of the string containing
115+
// UTF-8 (i.e. the multi-byte emoji grapheme) seems to have further regressed (e.g. the end
116+
// quotation mark is no longer shown and command output becomes garbled).
117+
//(DISABLED) @ cdb-command: dx os_string
118+
//(DISABLED) @ cdb-check:os_string : "IAMA OS string 😃" [Type: std::ffi::os_str::OsString]
119+
//(DISABLED) @ cdb-check: [<Raw View>] [Type: std::ffi::os_str::OsString]
120+
//(DISABLED) @ cdb-check: [chars] : "IAMA OS string 😃"
118121

119122
//@ cdb-command: dx some
120123
//@ cdb-check:some : Some [Type: enum2$<core::option::Option<i16> >]

0 commit comments

Comments
 (0)