From b17fcc10396991b4b095c279672398a9c54c03ab Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Wed, 16 Oct 2019 16:53:37 +0200 Subject: [PATCH] [gdb/testsuite] Fix regexp for reg value in jit-reader.exp On openSUSE Leap 15.1 (as well as on Fedora-x86_64-m64 buildbot) I see: ... FAIL: gdb.base/jit-reader.exp: with jit-reader: after mangling: current frame: info registers ... The problem is that r10 is printed signed: ... r10 0xffffffffffffffb0 -80^M ... but the regexp expects a signed value: ... "r10 $hex +$decimal" \ ... Fix this by allowing signed values. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2019-10-16 Tom de Vries * gdb.base/jit-reader.exp: Allow non-pointer registers to be printed as signed. Change-Id: Ie494d24fad7a9af7ac6bfaf731c4aa04f1333830 --- gdb/testsuite/ChangeLog | 5 ++++ gdb/testsuite/gdb.base/jit-reader.exp | 41 ++++++++++++++------------- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index ce6e0f221a9..c9e245766da 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-10-16 Tom de Vries + + * gdb.base/jit-reader.exp: Allow non-pointer registers to be printed + as signed. + 2019-10-14 Simon Marchi * gdb.mi/list-thread-groups-available.exp: Read entries one by diff --git a/gdb/testsuite/gdb.base/jit-reader.exp b/gdb/testsuite/gdb.base/jit-reader.exp index 7c07c16363d..1ef3341bd25 100644 --- a/gdb/testsuite/gdb.base/jit-reader.exp +++ b/gdb/testsuite/gdb.base/jit-reader.exp @@ -65,32 +65,33 @@ proc info_registers_current_frame {sp} { set any "\[^\r\n\]*" + set neg_decimal "-?$decimal" gdb_test "info registers" \ [multi_line \ - "rax $hex +$decimal" \ - "rbx $hex +$decimal" \ - "rcx $hex +$decimal" \ - "rdx $hex +$decimal" \ - "rsi $hex +$decimal" \ - "rdi $hex +$decimal" \ + "rax $hex +$neg_decimal" \ + "rbx $hex +$neg_decimal" \ + "rcx $hex +$neg_decimal" \ + "rdx $hex +$neg_decimal" \ + "rsi $hex +$neg_decimal" \ + "rdi $hex +$neg_decimal" \ "rbp $hex +$hex" \ "rsp $sp +$sp" \ - "r8 $hex +$decimal" \ - "r9 $hex +$decimal" \ - "r10 $hex +$decimal" \ - "r11 $hex +$decimal" \ - "r12 $hex +$decimal" \ - "r13 $hex +$decimal" \ - "r14 $hex +$decimal" \ - "r15 $hex +$decimal" \ + "r8 $hex +$neg_decimal" \ + "r9 $hex +$neg_decimal" \ + "r10 $hex +$neg_decimal" \ + "r11 $hex +$neg_decimal" \ + "r12 $hex +$neg_decimal" \ + "r13 $hex +$neg_decimal" \ + "r14 $hex +$neg_decimal" \ + "r15 $hex +$neg_decimal" \ "rip $hex +$hex$any" \ "eflags $hex +\\\[$any\\\]" \ - "cs $hex +$decimal" \ - "ss $hex +$decimal" \ - "ds $hex +$decimal" \ - "es $hex +$decimal" \ - "fs $hex +$decimal" \ - "gs $hex +$decimal" \ + "cs $hex +$neg_decimal" \ + "ss $hex +$neg_decimal" \ + "ds $hex +$neg_decimal" \ + "es $hex +$neg_decimal" \ + "fs $hex +$neg_decimal" \ + "gs $hex +$neg_decimal" \ ] } -- 2.30.2