[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 --git a/gdb/testsuite/gdb.python/py-record-btrace.exp b/gdb/testsuite/gdb.python/py-record-btrace.exp
index c055a882f859b62e19b202115dff2a81f22a340b..703db0ce8e144f15735662d2fd6392592da5a203 100644 (file)
--- 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