about summary refs log tree commit diff
path: root/src/test/debuginfo/pretty-std.rs
diff options
context:
space:
mode:
authorWesley Wiser <wesleywiser@microsoft.com>2021-09-10 19:51:10 -0400
committerWesley Wiser <wesleywiser@microsoft.com>2021-09-10 21:46:40 -0400
commite156df2a1cd722ebea9f2958d3627f1819835c0a (patch)
tree4c85e18d602a2516a1e546761a262632ced9f6c1 /src/test/debuginfo/pretty-std.rs
parentf1f5108ca367bef48d1429e889f0ec9340de5038 (diff)
downloadrust-e156df2a1cd722ebea9f2958d3627f1819835c0a.tar.gz
rust-e156df2a1cd722ebea9f2958d3627f1819835c0a.zip
Fix debuginfo tests for the latest version of the Windows SDK.
- Cdb now correctly visualizes enums.
- Cdb doesn't render emoji characters in `OSStr` anymore.
- Cdb doesn't always render `str` correctly (#88840)
Diffstat (limited to 'src/test/debuginfo/pretty-std.rs')
-rw-r--r--src/test/debuginfo/pretty-std.rs12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/test/debuginfo/pretty-std.rs b/src/test/debuginfo/pretty-std.rs
index baeada69d1c..55a4ecc1c1a 100644
--- a/src/test/debuginfo/pretty-std.rs
+++ b/src/test/debuginfo/pretty-std.rs
@@ -111,9 +111,11 @@
 // cdb-check:    [11]             : 33 '!' [Type: char]
 
 // cdb-command: dx os_string
-// cdb-check:os_string        : "IAMA OS string 😃" [Type: std::ffi::os_str::OsString]
+// NOTE: OSString is WTF-8 encoded which Windows debuggers don't understand. Verify the UTF-8
+//       portion displays correctly.
+// cdb-check:os_string        : "IAMA OS string [...]" [Type: std::ffi::os_str::OsString]
 // cdb-check:    [<Raw View>]     [Type: std::ffi::os_str::OsString]
-// cdb-check:    [chars]          : "IAMA OS string 😃"
+// cdb-check:    [chars]          : "IAMA OS string [...]"
 
 // cdb-command: dx some
 // cdb-check:some             : Some [Type: enum$<core::option::Option<i16> >]
@@ -127,8 +129,10 @@
 // cdb-check:    [variant]        : None
 
 // cdb-command: dx some_string
-// NOTE: cdb fails to interpret debug info of Option enums on i686.
-// cdb-check:some_string      [Type: enum$<core::option::Option<alloc::string::String>, 1, [...], Some>]
+// cdb-check:some_string      :  Some({...}) [Type: enum$<core::option::Option<alloc::string::String>, 1, [...], Some>]
+// cdb-check:    [<Raw View>]     [Type: enum$<core::option::Option<alloc::string::String>, 1, [...], Some>]
+// cdb-check:    [variant]        :  Some
+// cdb-check:    [+0x000] __0              : "IAMA optional string!" [Type: alloc::string::String]
 
 // cdb-command: dx linkedlist
 // cdb-check:linkedlist       : { len=0x2 } [Type: alloc::collections::linked_list::LinkedList<i32>]