diff mbox

Fix "info registers" regexes in gdb.base/jit-reader.exp

Message ID 1528222791-10116-1-git-send-email-simon.marchi@ericsson.com
State New, archived
Headers

Commit Message

Simon Marchi June 5, 2018, 6:19 p.m. UTC 
  Commit

  e813d34 ("Align natural-format register values to the same column")

changed the output of "info registers" (tabs to spaces), but didn't
update gdb.base/jit-reader.exp.  Update the regexes to expect spaces
instead.

For some reason, this test is skipped by the buildbot (even in the
native x86-64 configuration), so we missed it.  We will need to
investigate why...

gdb/testsuite/ChangeLog:

	* gdb.base/jit-reader.exp (jit_reader_test): Expect spaces in
	"info registers" output.
---
 gdb/testsuite/gdb.base/jit-reader.exp | 54 +++++++++++++++++------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

Comments

Simon Marchi June 22, 2018, 5:42 p.m. UTC | #1 
On 2018-06-05 14:19, Simon Marchi wrote:
> Commit
> 
>   e813d34 ("Align natural-format register values to the same column")
> 
> changed the output of "info registers" (tabs to spaces), but didn't
> update gdb.base/jit-reader.exp.  Update the regexes to expect spaces
> instead.
> 
> For some reason, this test is skipped by the buildbot (even in the
> native x86-64 configuration), so we missed it.  We will need to
> investigate why...

I pushed this.

In the end, the x86-64 builder had a problem causing gcc to fail to 
compile all the test cases, leading to all of them being skipped.  It 
looks fine now.

Simon
diff mbox

Patch

diff --git a/gdb/testsuite/gdb.base/jit-reader.exp b/gdb/testsuite/gdb.base/jit-reader.exp
index 7a1e287..2ed7410 100644
--- a/gdb/testsuite/gdb.base/jit-reader.exp
+++ b/gdb/testsuite/gdb.base/jit-reader.exp
@@ -67,30 +67,30 @@  proc info_registers_current_frame {sp} {
 
     gdb_test "info registers" \
 	[multi_line \
-	     "rax            $hex	$decimal" \
-	     "rbx            $hex	$decimal" \
-	     "rcx            $hex	$decimal" \
-	     "rdx            $hex	$decimal" \
-	     "rsi            $hex	$decimal" \
-	     "rdi            $hex	$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" \
-	     "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" \
+	     "rax            $hex +$decimal" \
+	     "rbx            $hex +$decimal" \
+	     "rcx            $hex +$decimal" \
+	     "rdx            $hex +$decimal" \
+	     "rsi            $hex +$decimal" \
+	     "rdi            $hex +$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" \
+	     "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" \
 	    ]
 }
 
@@ -177,8 +177,8 @@  proc jit_reader_test {} {
 			 "rdx            <not saved>" \
 			 "rsi            <not saved>" \
 			 "rdi            <not saved>" \
-			 "rbp            $hex	$hex" \
-			 "rsp            $caller_sp	$caller_sp" \
+			 "rbp            $hex +$hex" \
+			 "rsp            $caller_sp +$caller_sp" \
 			 "r8             <not saved>" \
 			 "r9             <not saved>" \
 			 "r10            <not saved>" \
@@ -187,7 +187,7 @@  proc jit_reader_test {} {
 			 "r13            <not saved>" \
 			 "r14            <not saved>" \
 			 "r15            <not saved>" \
-			 "rip            $hex	$hex $any" \
+			 "rip            $hex +$hex $any" \
 			 "eflags         <not saved>" \
 			 "cs             <not saved>" \
 			 "ss             <not saved>" \