From: Yao Qi <yao@codesourcery.com>
To: Pedro Alves <palves@redhat.com>, <gdb-patches@sourceware.org>
Subject: Re: [PATCH] Fix mi-file.exp fails on remote host
Date: Wed, 14 May 2014 02:22:00 -0000 [thread overview]
Message-ID: <5372D2D6.2040903@codesourcery.com> (raw)
In-Reply-To: <537264BF.8050402@redhat.com>
On 05/14/2014 02:30 AM, Pedro Alves wrote:
> I don't get this rationale. I mean, I get that . is special in regexps, but
> although not strictly correct, it's usually harmless. I believe we have a
> ton of cases of just passing a filename with a dot as a regexp, as evidenced
> by ...
>
>> > # get the path and absolute path to the current executable
>> > mi_gdb_test "222-file-list-exec-source-files" \
>> > - "222\\\^done,files=\\\[\{file=\".*/${srcfile}\",fullname=\"$fullname_syntax${srcfile}\"\}.*]" \
>> > + "222\\\^done,files=\\\[\{file=\"[string_to_regexp ${srcfile}]\",fullname=\"$fullname_syntax${srcfile}\"\}.*]" \
>> > "Getting a list of source files."
> ... the second ${srcfile} in the exact same line your changing. So it
> looks odd to have to change one, but not the other.
Sorry for being unclear. It is not about ".", the culprit is "/" in
".*/${srcfile}". The test fails in my env because the file name is
"basics.c". At first, I remove "/" from the pattern and think better
to convert it to "string_to_regexp ${srcfile}". During the cleanup,
I remove the ".*" prefix by mistake, sorry :(
Here is the new one.
--
Yao (é½å°§)
Subject: [PATCH] Fix mi-file.exp fails on remote host
This patch fixes mi-file.exp fails on remote host. First, we can't
assume ${srcdir}/${subdir}/${srcfile} directory exists on remote host,
so this patch changes it to match ${srcfile} only on remote host.
Second, regexp pattern ".*/${srcfile}" isn't friendly to Windows path.
The file name is "basics.c" in my test env and can't match the pattern
due to "/" in it. Remove "/" from the pattern.
gdb/testsuite:
2014-05-14 Yao Qi <yao@codesourcery.com>
* gdb.mi/mi-file.exp (test_file_list_exec_source_file): Don't
match absolute path on remote host.
(test_file_list_exec_source_files): Remove "/" from the
pattern.
---
gdb/testsuite/gdb.mi/mi-file.exp | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gdb/testsuite/gdb.mi/mi-file.exp b/gdb/testsuite/gdb.mi/mi-file.exp
index 85998a2..eeedc4d 100644
--- a/gdb/testsuite/gdb.mi/mi-file.exp
+++ b/gdb/testsuite/gdb.mi/mi-file.exp
@@ -39,7 +39,11 @@ proc test_file_list_exec_source_file {} {
global srcdir
global subdir
global fullname_syntax
- set srcfilepath [string_to_regexp ${srcdir}/${subdir}/${srcfile}]
+ if { [is_remote host] } {
+ set srcfilepath ".*${srcfile}"
+ } else {
+ set srcfilepath [string_to_regexp ${srcdir}/${subdir}/${srcfile}]
+ }
# get the path and absolute path to the current executable
#
@@ -64,7 +68,7 @@ proc test_file_list_exec_source_files {} {
# get the path and absolute path to the current executable
mi_gdb_test "222-file-list-exec-source-files" \
- "222\\\^done,files=\\\[\{file=\".*/${srcfile}\",fullname=\"$fullname_syntax${srcfile}\"\}.*]" \
+ "222\\\^done,files=\\\[\{file=\".*${srcfile}\",fullname=\"$fullname_syntax${srcfile}\"\}.*]" \
"Getting a list of source files."
}
--
1.9.0
next prev parent reply other threads:[~2014-05-14 2:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-13 7:37 Yao Qi
2014-05-13 18:51 ` Pedro Alves
2014-05-14 2:22 ` Yao Qi [this message]
2014-05-14 8:48 ` Pedro Alves
2014-05-14 12:25 ` Yao Qi
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=5372D2D6.2040903@codesourcery.com \
--to=yao@codesourcery.com \
--cc=gdb-patches@sourceware.org \
--cc=palves@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).