diff options
| author | bors <bors@rust-lang.org> | 2021-04-29 08:22:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-04-29 08:22:44 +0000 |
| commit | 78c963945aa35a76703bf62e024af2d85b2796e2 (patch) | |
| tree | 90b165a21c18a3d596fc060c2c3ab9573103d147 | |
| parent | d337cec9af59af14bde28fc8e5b250c1b31c1b72 (diff) | |
| parent | e8e5a884ad9d6d1f7f0091cde961d462e17765eb (diff) | |
| download | rust-78c963945aa35a76703bf62e024af2d85b2796e2.tar.gz rust-78c963945aa35a76703bf62e024af2d85b2796e2.zip | |
Auto merge of #84618 - lrh2000:fix-gdb-10-str, r=Mark-Simulacrum
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]: https://github.com/rust-lang/rust/issues/79009#issuecomment-826952708
| -rw-r--r-- | src/test/debuginfo/extern-c-fn.rs | 13 | ||||
| -rw-r--r-- | src/test/debuginfo/pretty-huge-vec.rs | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/test/debuginfo/extern-c-fn.rs b/src/test/debuginfo/extern-c-fn.rs index 5043e7d9b8a..17a452ec634 100644 --- a/src/test/debuginfo/extern-c-fn.rs +++ b/src/test/debuginfo/extern-c-fn.rs @@ -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 diff --git a/src/test/debuginfo/pretty-huge-vec.rs b/src/test/debuginfo/pretty-huge-vec.rs index cbd2278f7e2..67155b4e9f0 100644 --- a/src/test/debuginfo/pretty-huge-vec.rs +++ b/src/test/debuginfo/pretty-huge-vec.rs @@ -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)] |