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

Message ID 20230217142213.7147-1-tdevries@suse.de
State Committed
Headers
Series [gdb/testsuite] Add xfail case in gdb.python/py-record-btrace.exp |

Commit Message

Tom de Vries Feb. 17, 2023, 2:22 p.m. UTC
  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.
---
 gdb/testsuite/gdb.python/py-record-btrace.exp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)


base-commit: ccd87ffec78506220973b84f4f2b48137a9ef408
  

Comments

Terekhov, Mikhail via Gdb-patches Feb. 20, 2023, 7:38 a.m. UTC | #1
Hello Tom,

>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.
>---
> gdb/testsuite/gdb.python/py-record-btrace.exp | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)

Looks good to me.

Markus.
Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de <http://www.intel.de>
Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva  
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928
  
Tom de Vries Feb. 20, 2023, 10:36 a.m. UTC | #2
On 2/20/23 08:38, Metzger, Markus T wrote:
> Hello Tom,
> 
>> 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.
>> ---
>> gdb/testsuite/gdb.python/py-record-btrace.exp | 7 ++++++-
>> 1 file changed, 6 insertions(+), 1 deletion(-)
> 
> Looks good to me.
> 


Thanks, added approved-by tag and committed.

- Tom


> Markus.
> Intel Deutschland GmbH
> Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
> Tel: +49 89 99 8853-0, www.intel.de <http://www.intel.de>
> Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva
> Chairperson of the Supervisory Board: Nicole Lau
> Registered Office: Munich
> Commercial Register: Amtsgericht Muenchen HRB 186928
>
  

Patch

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