public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed
From: Tom de Vries <tdevries@suse.de>
To: Andreas Schwab <schwab@suse.de>
Cc: gdb-patches@sourceware.org
Subject: [committed][gdb/testsuite] Use string_to_regexp on core filename in gdb_core_cmd
Date: Thu, 12 Mar 2020 11:04:46 +0100	[thread overview]
Message-ID: <404e7d8a-8946-3d12-7122-6fe9753f8c30@suse.de> (raw)
In-Reply-To: <mvm7dzq53r3.fsf@suse.de>

[-- Attachment #1: Type: text/plain, Size: 689 bytes --]

[ was: Re: [committed][gdb/testsuite] Fix core file load FAIL in
tls-core.exp ]
On 12-03-2020 10:20, Andreas Schwab wrote:
> On Mär 12 2020, Tom de Vries wrote:
> 
>> diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
>> index 9e903ba347..bb70ef13f2 100644
>> --- a/gdb/testsuite/lib/gdb.exp
>> +++ b/gdb/testsuite/lib/gdb.exp
>> @@ -4648,7 +4648,7 @@ proc gdb_core_cmd { core test } {
>>  	    fail "$test (bad file format)"
>>  	    return -1
>>  	}
>> -	-re ": No such file or directory.*\r\n$gdb_prompt $" {
>> +	-re "$core: No such file or directory.*\r\n$gdb_prompt $" {
> 
> I think you need to regexp-quote the string.
> 

Ack, fixed by this patch.

Thanks,
- Tom

[-- Attachment #2: 0001-gdb-testsuite-Use-string_to_regexp-on-core-filename-in-gdb_core_cmd.patch --]
[-- Type: text/x-patch, Size: 1196 bytes --]

[gdb/testsuite] Use string_to_regexp on core filename in gdb_core_cmd

In commit 1281424ccf "[gdb/testsuite] Fix core file load FAIL in
tls-core.exp", I've made this change:
...
-       -re ": No such file or directory.*\r\n$gdb_prompt $" {
+       -re "$core: No such file or directory.*\r\n$gdb_prompt $" {
...

However, the $core variable contains a filename which needs to be matched
as a literal string, not as a regexp.

Fix this by using string_to_regexp.

Tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2020-03-12  Tom de Vries  <tdevries@suse.de>

	* lib/gdb.exp (gdb_core_cmd): Use string_to_regexp for regexp-matching
	$core.

---
 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 bb70ef13f2..ae2d810a1e 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -4648,7 +4648,7 @@ proc gdb_core_cmd { core test } {
 	    fail "$test (bad file format)"
 	    return -1
 	}
-	-re "$core: No such file or directory.*\r\n$gdb_prompt $" {
+	-re -wrap "[string_to_regexp $core]: No such file or directory.*" {
 	    fail "$test (file not found)"
 	    return -1
 	}

      reply	other threads:[~2020-03-12 10:04 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-12  8:51 [committed][gdb/testsuite] Fix core file load FAIL in tls-core.exp Tom de Vries
2020-03-12  9:20 ` Andreas Schwab
2020-03-12 10:04   ` Tom de Vries [this message]

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=404e7d8a-8946-3d12-7122-6fe9753f8c30@suse.de \
    --to=tdevries@suse.de \
    --cc=gdb-patches@sourceware.org \
    --cc=schwab@suse.de \
    /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).