diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5875843472c..222e8198fd0 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2021-02-06 Tom de Vries + + PR testsuite/26922 + * gdb.tui/tui-layout-asm.exp: Ignore whitespace mismatches when + scrolling. + 2021-02-05 Tom de Vries PR breakpoints/27313 diff --git a/gdb/testsuite/gdb.tui/tui-layout-asm.exp b/gdb/testsuite/gdb.tui/tui-layout-asm.exp index 347064aacc6..19ce333ca9e 100644 --- a/gdb/testsuite/gdb.tui/tui-layout-asm.exp +++ b/gdb/testsuite/gdb.tui/tui-layout-asm.exp @@ -58,8 +58,11 @@ while (1) { # Send the down key to GDB. send_gdb "\033\[B" incr down_count - if {[Term::wait_for [string_to_regexp $line]] \ - && [Term::get_line 1] == $line} { + set re_line [string_to_regexp $line] + # Ignore whitespace mismatches. + regsub -all {\s+} $re_line {\s+} re_line + if {[Term::wait_for $re_line] \ + && [regexp $re_line [Term::get_line 1]]} { # We scrolled successfully. } else { fail "$testname (scroll failed)"