[binutils-gdb] [gdb/testsuite] Add xfail case in gdb.python/py-record-btrace.exp

[binutils-gdb] [gdb/testsuite] Add xfail case in gdb.python/py-record-btrace.exp

[Tom de Vries]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=1bcaeecb7fd8a23f05033bc9a340696b685db17f

commit 1bcaeecb7fd8a23f05033bc9a340696b685db17f
Author: Tom de Vries <tdevries@suse.de>
Date:   Mon Feb 20 11:16:02 2023 +0100

    [gdb/testsuite] Add xfail case in gdb.python/py-record-btrace.exp
    
    I came across:
    ...
    gdb) PASS: gdb.python/py-record-btrace.exp: prepare record: stepi 100
    python insn = r.instruction_history^M
    warning: Non-contiguous trace at instruction 1 (offset = 0x3e10).^M
    (gdb) FAIL: gdb.python/py-record-btrace.exp: prepare record: python insn = r.i\
    nstruction_history
    ...
    
    I'm assuming it's the same root cause as for the already present XFAIL.
    
    Fix this by recognizing above warning in the xfail regexp.
    
    Tested on x86_64-linux, although sofar I was not able to trigger the warning
    again.
    
    Approved-By: Markus T. Metzger <markus.t.metzger@intel.com>

Diff:
---
 gdb/testsuite/gdb.python/py-record-btrace.exp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gdb/testsuite/gdb.python/py-record-btrace.exp b/gdb/testsuite/gdb.python/py-record-btrace.exp
index c055a882f85..703db0ce8e1 100644
--- a/gdb/testsuite/gdb.python/py-record-btrace.exp
+++ b/gdb/testsuite/gdb.python/py-record-btrace.exp
@@ -76,6 +76,11 @@ with_test_prefix "prepare record" {
 		  "warning: Decode error \\($nonl_re*\\) at instruction $decimal" \
 		  "\\(offset = $hex, pc = $hex\\):" \
 		  "$nonl_re*\\."]]
+    set xfail_re_2 \
+	[join \
+	     [list \
+		  "warning: Non-contiguous trace at instruction $decimal" \
+		  "\\(offset = $hex\\)\\."]]
 
     set got_xfail 0
     set cmd "python insn = r.instruction_history"
@@ -83,7 +88,7 @@ with_test_prefix "prepare record" {
 	-re "^[string_to_regexp $cmd]\r\n$::gdb_prompt $" {
 	    pass $gdb_test_name
 	}
-	-re -wrap "$xfail_re" {
+	-re -wrap "($xfail_re|$xfail_re_2)" {
 	    if { $have_xfail } {
 		xfail $gdb_test_name
 		set got_xfail 1