From 3217502e1ba7409676e192100a0147a49dd5ae7a Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Thu, 12 Mar 2020 11:03:07 +0100 Subject: [PATCH] [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 * lib/gdb.exp (gdb_core_cmd): Use string_to_regexp for regexp-matching $core. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/lib/gdb.exp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 3d829b021f7..77b3695b9a0 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-03-12 Tom de Vries + + * lib/gdb.exp (gdb_core_cmd): Use string_to_regexp for regexp-matching + $core. + 2020-03-12 Tom de Vries * lib/gdb.exp (gdb_core_cmd): Make "No such file or directory" regexp diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index bb70ef13f2c..ae2d810a1eb 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 } -- 2.30.2