From dc29a1ce6a25233e608f90511e67af3c18e19a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= Date: Sat, 23 Jan 2016 13:17:34 +0100 Subject: gdb.trace: Fix unavailable-dwarf-piece.exp on big endian targets The test constructs fake DWARF info for a C structure involving bitfields. DWARF bitfields are always counted from LSB, while the order in which bitfields are allocated in a C struct depends on the target endianness - thus the generated DWARF marks different bitfields as unavailable when target is big endian. Accordingly, we need different expected outputs. Tested on s390 and s390x, no regression on x86_64. gdb/testsuite/ChangeLog: * gdb.trace/unavailable-dwarf-piece.exp: Fix bitfield handling on big endian targets. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp | 20 +++++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) (limited to 'gdb/testsuite') diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 8f7dc6d..8ee2efa 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-01-23 Marcin Kościelnicki + + * gdb.trace/unavailable-dwarf-piece.exp: Fix bitfield handling on big + endian targets. + 2016-01-22 Jan Kratochvil Pedro Alves diff --git a/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp b/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp index 60820dd..b5052d1 100644 --- a/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp +++ b/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp @@ -325,10 +325,24 @@ with_test_prefix "tracing bar" { gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" gdb_test_no_output "tstop" + set endian "" + gdb_test_multiple "show endian" "show endian" { + -re ".* (big|little) endian.*$gdb_prompt $" { + set endian $expect_out(1,string) + pass "endianness: $endian" + } + } + gdb_test "tfind 0" "Found trace frame 0, tracepoint .*" - gdb_test "p/d x" "\\\$${decimal} = {a = 0, b = , c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0}" - gdb_test "p/d y" "\\\$${decimal} = {a = 0, b = 0, c = 0, d = 0, e = , f = 0, g = 0, h = 0, i = 0, j = 0}" - gdb_test "p/d z" "\\\$${decimal} = {a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = , j = 0}" + if { $endian == "little" } { + gdb_test "p/d x" "\\\$${decimal} = {a = 0, b = , c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0}" + gdb_test "p/d y" "\\\$${decimal} = {a = 0, b = 0, c = 0, d = 0, e = , f = 0, g = 0, h = 0, i = 0, j = 0}" + gdb_test "p/d z" "\\\$${decimal} = {a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = , j = 0}" + } else { + gdb_test "p/d x" "\\\$${decimal} = {a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = , j = 0}" + gdb_test "p/d y" "\\\$${decimal} = {a = 0, b = 0, c = 0, d = 0, e = 0, f = , g = 0, h = 0, i = 0, j = 0}" + gdb_test "p/d z" "\\\$${decimal} = {a = 0, b = , c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, i = 0, j = 0}" + } gdb_test "tfind none" "No longer looking at any trace frame.*" } -- cgit v1.1