[committed,gdb/testsuite] Fix gdb.base/sect-cmd.exp

Message ID 20210608080534.GA14596@delia
State New
Headers show
Series
  • [committed,gdb/testsuite] Fix gdb.base/sect-cmd.exp
Related show

Commit Message

Tom de Vries June 8, 2021, 8:05 a.m.
Hi,

With a testsuite setup modified to make expect wait a little bit longer for
gdb output (see PR27957), I reliably run into:
...
(gdb) FAIL: gdb.base/sect-cmd.exp: set section .text to original \
  address (timeout)
...

The problem is a too greedy regexp:
...
       -re ".*$address1 \- $address2 is $section_name.*" {
...
which ends up consuming the gdb prompt with the terminating ".*".

Fix this by limiting the regexp to a single line.

Tested on x86_64-linux.

Committed to trunk.

Thanks,
- Tom

[gdb/testsuite] Fix gdb.base/sect-cmd.exp

gdb/testsuite/ChangeLog:

2021-06-08  Tom de Vries  <tdevries@suse.de>

	* gdb.base/sect-cmd.exp: Fix saw_section_address_line regexp.

---
 gdb/testsuite/gdb.base/sect-cmd.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/gdb/testsuite/gdb.base/sect-cmd.exp b/gdb/testsuite/gdb.base/sect-cmd.exp
index 7aa24ca615f..cb1e4464a69 100644
--- a/gdb/testsuite/gdb.base/sect-cmd.exp
+++ b/gdb/testsuite/gdb.base/sect-cmd.exp
@@ -58,7 +58,7 @@  if { $address1 == "" || $address2 == "" || $section_name == "" } {
 set saw_section_address_line false
 gdb_test_multiple "section $section_name $address1" \
     "set section $section_name to original address" {
-	-re ".*$address1 \- $address2 is $section_name.*" {
+	-re ".*$address1 \- $address2 is $section_name in \[^\r\n\]*" {
 	    set saw_section_address_line true
 	    exp_continue
 	}