From: Tom de Vries <tdevries@suse.de>
To: gdb-patches@sourceware.org
Subject: [pushed 1/2] [gdb/testsuite] Make Term::wait_for "" match only a prompt
Date: Wed, 21 Jun 2023 15:31:59 +0200 [thread overview]
Message-ID: <20230621133200.25576-1-tdevries@suse.de> (raw)
The semantics of Term::wait_for is:
...
# Accept some output from gdb and update the screen. WAIT_FOR is
# a regexp matching the line to wait for. Return 0 on timeout, 1
# on success.
proc wait_for {wait_for} {
...
Note that besides the regexp, also a subsequent gdb prompt is matched.
I recently used wait_for "" in a few test-cases, thinking that this would
match just a prompt, but in fact that's not the case.
Fix this in wait_for, and add a corresponding test in gdb.tui/tuiterm-2.exp.
Tested on x86_64-linux.
---
gdb/testsuite/gdb.tui/tuiterm-2.exp | 13 +++++++++++++
gdb/testsuite/lib/tuiterm.exp | 4 ++++
2 files changed, 17 insertions(+)
diff --git a/gdb/testsuite/gdb.tui/tuiterm-2.exp b/gdb/testsuite/gdb.tui/tuiterm-2.exp
index e7a0f03e4ba..8e838d31073 100644
--- a/gdb/testsuite/gdb.tui/tuiterm-2.exp
+++ b/gdb/testsuite/gdb.tui/tuiterm-2.exp
@@ -93,6 +93,19 @@ with_override Term::accept_gdb_output test_accept_gdb_output {
}
gdb_assert { ![Term::command "foo"] }
}
+
+ with_test_prefix Term::wait_for {
+ Term::_setup 4 20
+ set send_cnt 0
+ set expect_send {}
+ set action_cnt 0
+ set actions {
+ {
+ Term::_insert "(gdb) "
+ }
+ }
+ gdb_assert { [Term::wait_for ""] }
+ }
}
}
}
diff --git a/gdb/testsuite/lib/tuiterm.exp b/gdb/testsuite/lib/tuiterm.exp
index dc928ae5aff..41fa554aa09 100644
--- a/gdb/testsuite/lib/tuiterm.exp
+++ b/gdb/testsuite/lib/tuiterm.exp
@@ -789,6 +789,10 @@ namespace eval Term {
set fn "wait_for"
set prompt_wait_for "(^|\\|)$gdb_prompt \$"
+ if { $wait_for == "" } {
+ set wait_for $prompt_wait_for
+ }
+
debug_tui_matching "$fn: regexp: '$wait_for'"
while 1 {
base-commit: 340640f710e690b37c885166949595cde5f827b2
--
2.35.3
next reply other threads:[~2023-06-21 13:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-21 13:31 Tom de Vries [this message]
2023-06-21 13:32 ` [pushed 2/2] [gdb/testsuite] Reimplement Term::command_no_prompt_prefix Tom de Vries
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230621133200.25576-1-tdevries@suse.de \
--to=tdevries@suse.de \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).