Skip to content

Commit

Permalink
Auto merge of #84618 - lrh2000:fix-gdb-10-str, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Fix failed tests related to pointer printing when using GDB 10

As mentioned in #79009, there are four failed debuginfo test cases when using GDB 10. This PR fixes two of them, which fail because GDB 10 won't print pointers as string anymore. We can use `printf` as a workaround. It should work regardless of the version of GDB.

Refer this [comment] for more details.

[comment]: #79009 (comment)
  • Loading branch information
bors committed Apr 29, 2021
2 parents d337cec + e8e5a88 commit 78c9639
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
13 changes: 6 additions & 7 deletions src/test/debuginfo/extern-c-fn.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,16 @@
// === GDB TESTS ===================================================================================
// gdb-command:run

// gdb-command:print s
// gdbg-check:$1 = [...]"abcd"
// gdbr-check:$1 = [...]"abcd\000"
// gdb-command:printf "s = \"%s\"\n", s
// gdb-check:s = "abcd"
// gdb-command:print len
// gdb-check:$2 = 20
// gdb-check:$1 = 20
// gdb-command:print local0
// gdb-check:$3 = 19
// gdb-check:$2 = 19
// gdb-command:print local1
// gdb-check:$4 = true
// gdb-check:$3 = true
// gdb-command:print local2
// gdb-check:$5 = 20.5
// gdb-check:$4 = 20.5

// gdb-command:continue

Expand Down
2 changes: 1 addition & 1 deletion src/test/debuginfo/pretty-huge-vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// gdb-check:$1 = Vec(size=1000000000) = {[...]...}

// gdb-command: print slice
// gdb-check:$2 = &[u8] {data_ptr: [...]"\000", length: 1000000000}
// gdb-check:$2 = &[u8] {data_ptr: [...], length: 1000000000}

#![allow(unused_variables)]

Expand Down

0 comments on commit 78c9639

Please sign in to comment.