From a3e9c2f9da9ab84bb5f0d1e6dc7e99e6114ade39 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Fri, 3 Dec 2021 21:01:42 -0500 Subject: [PATCH] gdb/testsuite: fix two "maint info line-table"-related tests Commit 92228a334ba2 ("gdb: small "maintenance info line-table" readability improvements") change the output format of "maint info line-table" slightly, adding some empty lines between each line-table. This causes two tests to start failing, update them to account for those empty lines. Change-Id: I9d33a58fce3e860ba0554b25f5582e8066a5c519 --- gdb/testsuite/gdb.base/maint.exp | 4 ++++ gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp index 4b200879728..667f3733c9a 100644 --- a/gdb/testsuite/gdb.base/maint.exp +++ b/gdb/testsuite/gdb.base/maint.exp @@ -466,6 +466,10 @@ gdb_test_multiple "maint info line-table" \ # Matches an end marker in the above. exp_continue } + -re "^\r\n" { + # Empty line between tables. + exp_continue + } -re "^$gdb_prompt $" { gdb_assert $saw_srcfile $gdb_test_name } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp b/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp index d55b7fd150e..1a4fe4a3bb6 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp @@ -173,6 +173,10 @@ gdb_test_multiple "maint info line-table gdb.dwarf2/dw2-ranges-base.c" \ incr end_seq_count exp_continue } + -re "^\r\n" { + # Empty lines between tables. + exp_continue + } -re "^$gdb_prompt $" { gdb_assert [expr $end_seq_count == 3] $gdb_test_name } -- 2.30.2