From: Simon Marchi <simon.marchi@polymtl.ca>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@polymtl.ca>
Subject: [PATCH] gdb/testsuite: get_set_option_choices: expect \r\n after each item
Date: Mon, 14 Nov 2022 10:14:16 -0500 [thread overview]
Message-ID: <20221114151416.372074-1-simon.marchi@polymtl.ca> (raw)
I get some random failures since commit 8d45c3a82a0e ("[gdb/testsuite]
Set completions to unlimited in get_set_option_choices"), which can be
reproduced with:
$ make check-read1 TESTS="gdb.base/parse_number.exp"
For instance:
set architecture A^M
Ambiguous item "A".^M
(gdb) FAIL: gdb.base/parse_number.exp: arch=A: set architecture A
The problem is the regexp in get_set_option_choices, it can match only
part of a completion result. With check-read1, that is alwasy one
letter. Fix this by expecting the \r\n at the end of the line, so we
only match entire results.
Change-Id: Ib1733737feab7dde0f7095866e089081a891054e
---
gdb/testsuite/lib/gdb.exp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index bdb8da9daf98..abc67fb2b9e2 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -9138,7 +9138,7 @@ proc get_set_option_choices {set_cmd} {
with_set max-completions unlimited {
gdb_test_multiple $cmd $test {
- -re "\r\n$set_cmd (\[^\r\n\]+)" {
+ -re "\r\n$set_cmd (\[^\r\n\]+)\r\n" {
lappend values $expect_out(1,string)
exp_continue
}
base-commit: a5b6e43669b78729d2ef78d668e19bac2b11197d
--
2.38.1
next reply other threads:[~2022-11-14 15:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-14 15:14 Simon Marchi [this message]
2022-11-15 7:01 ` Tom de Vries
2022-11-15 14:59 ` Simon Marchi
2022-11-15 15:05 ` Tom de Vries
2022-11-15 15:49 ` Simon Marchi
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=20221114151416.372074-1-simon.marchi@polymtl.ca \
--to=simon.marchi@polymtl.ca \
--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).