aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorTom de Vries <tdevries@suse.de>2021-06-08 10:04:44 +0200
committerTom de Vries <tdevries@suse.de>2021-06-08 10:04:44 +0200
commit25ff4de715741c889efba6340cc3c508113ed2f2 (patch)
treeb8c5c423cd480f7b0494564b829d874e8122e3a9 /gdb
parenta55b92be28bab98a2acae597cbd365eb53b5faf3 (diff)
downloadgdb-25ff4de715741c889efba6340cc3c508113ed2f2.zip
gdb-25ff4de715741c889efba6340cc3c508113ed2f2.tar.gz
gdb-25ff4de715741c889efba6340cc3c508113ed2f2.tar.bz2
[gdb/testsuite] Fix gdb.base/sect-cmd.exp
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. gdb/testsuite/ChangeLog: 2021-06-08 Tom de Vries <tdevries@suse.de> * gdb.base/sect-cmd.exp: Fix saw_section_address_line regexp.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/testsuite/ChangeLog4
-rw-r--r--gdb/testsuite/gdb.base/sect-cmd.exp2
2 files changed, 5 insertions, 1 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 4504096..a856e89 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-08 Tom de Vries <tdevries@suse.de>
+
+ * gdb.base/sect-cmd.exp: Fix saw_section_address_line regexp.
+
2021-06-07 Simon Marchi <simon.marchi@polymtl.ca>
* gdb.base/continue-all-already-running.exp: Call fail if can't
diff --git a/gdb/testsuite/gdb.base/sect-cmd.exp b/gdb/testsuite/gdb.base/sect-cmd.exp
index 7aa24ca..cb1e446 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
}