From 5031d0ae0b9fb1a42eb8ff9d2b5098a56774cee1 Mon Sep 17 00:00:00 2001 From: Sergio Durigan Junior Date: Tue, 18 Sep 2018 13:53:43 -0400 Subject: [PATCH] Expect optional "arch=" when executing "-stack-list-frames" on gdb.arch/amd64-invalid-stack-top.exp Another case of incomplete regexp. The problem is very similar to the one happening with gdb.arch/amd64-invalid-stack-middle.exp. The output when GDB is compiled with "--enable-targets" is: (gdb) interpreter-exec mi "-stack-list-frames" ^done,stack=[frame={level="0",addr="0x00000000004005e7",func="func2",arch="i386:x86-64"}] While the output when "--enable-targets" is not specified is: (gdb) interpreter-exec mi "-stack-list-frames" ^done,stack=[frame={level="0",addr="0x00000000004005e7",func="func2"}] The fix is, again, to extend the current regexp and expect for the optional "arch=" part. With this patch, the test now passes on both scenarios. OK? gdb/testsuite/ChangeLog: 2018-09-18 Sergio Durigan Junior * gdb.arch/amd64-invalid-stack-top.exp: Expect optional "arch=" keyword when executing "-stack-list-frames". --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.arch/amd64-invalid-stack-top.exp | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 8c0438f..701d979 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2018-09-18 Sergio Durigan Junior + * gdb.arch/amd64-invalid-stack-top.exp: Expect optional + "arch=" keyword when executing "-stack-list-frames". + +2018-09-18 Sergio Durigan Junior + * gdb.arch/amd64-invalid-stack-middle.exp: Expect optional "arch=" keyword when executing "-stack-list-frames". diff --git a/gdb/testsuite/gdb.arch/amd64-invalid-stack-top.exp b/gdb/testsuite/gdb.arch/amd64-invalid-stack-top.exp index 64bcfe0..d3a4eab 100644 --- a/gdb/testsuite/gdb.arch/amd64-invalid-stack-top.exp +++ b/gdb/testsuite/gdb.arch/amd64-invalid-stack-top.exp @@ -72,9 +72,9 @@ if ![runto breakpt] { } gdb_test "interpreter-exec mi \"-stack-list-frames\"" \ - "\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"func2\"\}\\\]" \ + "\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"func2\"(,arch=\"\[^\"\]+\")?\}\\\]" \ "check mi -stack-list-frames command, first time" gdb_test "interpreter-exec mi \"-stack-list-frames\"" \ - "\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"func2\"\}\\\]" \ + "\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"func2\"(,arch=\"\[^\"\]+\")?\}\\\]" \ "check mi -stack-list-frames command, second time" -- 2.7.4