From: Keith Seitz <keiths@redhat.com>
To: Sergio Durigan Junior <sergiodj@redhat.com>
Cc: gdb-patches@sourceware.org
Subject: Re: [RFA/testsuite] Regexp-escape command in capture_command_output
Date: Thu, 11 Jun 2015 20:22:00 -0000 [thread overview]
Message-ID: <5579EDE5.3080802@redhat.com> (raw)
In-Reply-To: <87zj46uhp1.fsf@redhat.com>
On 06/11/2015 01:13 PM, Sergio Durigan Junior wrote:
>
> Aha, this is definitely not clear in the function comments. Would it be
> possible to explicitly mention this there?
>
Sure thing!
Keith
From 52323e069647b7931ad17c906b5a77980cc8b5e9 Mon Sep 17 00:00:00 2001
From: Keith Seitz <keiths@redhat.com>
Date: Thu, 11 Jun 2015 13:15:17 -0700
Subject: [PATCH] Regexp-escape command in capture_command_output
The test suite library procedure capture_command_output will fail if the
given command contains any regexp characters, such as "+" or "*". I noticed
this while writing a test which attempts to call:
set xyz [capture_command_output "list +,-" ""]
Because COMMAND is not escaped, gdb_test_multiple will generate a false
FAIL. This simple fix corrects that oversight.
I've also updated the comment to clarify that PREFIX is a regexp.
testsuite/ChangeLog
* lib/gdb.exp (capture_command_output): Regexp-escape `command'
before using it in the matching pattern.
Clarify that `prefix' is a regular expression.
---
gdb/testsuite/lib/gdb.exp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 41797e7..2796514 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -5196,12 +5196,15 @@ proc parse_args { argset } {
# number of items expected to be passed into the procedure...
}
-# Capture the output of COMMAND in a string ignoring PREFIX; return
that string.
+# Capture the output of COMMAND in a string ignoring PREFIX (a regexp);
+# return that string.
+
proc capture_command_output { command prefix } {
global gdb_prompt
global expect_out
set output_string ""
+ set command [string_to_regexp $command]
gdb_test_multiple "$command" "capture_command_output for $command" {
-re "${command}\[\r\n\]+${prefix}(.*)\[\r\n\]+$gdb_prompt $" {
set output_string $expect_out(1,string)
--
2.1.0
next prev parent reply other threads:[~2015-06-11 20:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-19 22:14 [PATCH v5] Explicit locations: add UI features for CLI Keith Seitz
2015-05-19 22:22 ` Keith Seitz
2015-05-19 22:27 ` [RFA/testsuite] Regexp-escape command in capture_command_output Keith Seitz
2015-06-11 19:09 ` Sergio Durigan Junior
2015-06-11 20:10 ` Keith Seitz
2015-06-11 20:13 ` Sergio Durigan Junior
2015-06-11 20:22 ` Keith Seitz [this message]
2015-06-11 20:25 ` Sergio Durigan Junior
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=5579EDE5.3080802@redhat.com \
--to=keiths@redhat.com \
--cc=gdb-patches@sourceware.org \
--cc=sergiodj@redhat.com \
/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).