GDB testsuite: Escape paths used in regular expressions
Commit Message
This patch fixes problems with a few GDB testsuites when executing in a
path that contains special characters (e.g. "++"). When such paths are
used as a regular expression, the regular expression parser will choke
and cause the tests to fail. This patch introduces a new function to
escape strings that will be used as regular expressions, using it to
sanitize path names used in expect scripts.
If it looks good, please commit. Thanks!
gdb/testsuite/:
* gdb.base/maint.exp: Escape paths used in regular expressions.
* gdb.stabs/weird.exp: Likewise.
* gdb.exp (escape_regex_chars): New.
Signed-off-by: Zachary T Welch <zwelch@codesourcery.com>
---
gdb/testsuite/gdb.base/maint.exp | 15 +++++++++------
gdb/testsuite/gdb.stabs/weird.exp | 3 ++-
gdb/testsuite/lib/gdb.exp | 21 +++++++++++++++++++++
3 files changed, 32 insertions(+), 7 deletions(-)
Comments
On 02/10/2016 04:39 PM, Zachary T Welch wrote:
> This patch fixes problems with a few GDB testsuites when executing in a
> path that contains special characters (e.g. "++"). When such paths are
> used as a regular expression, the regular expression parser will choke
> and cause the tests to fail. This patch introduces a new function to
> escape strings that will be used as regular expressions, using it to
> sanitize path names used in expect scripts.
>
> If it looks good, please commit. Thanks!
>
> gdb/testsuite/:
> * gdb.base/maint.exp: Escape paths used in regular expressions.
> * gdb.stabs/weird.exp: Likewise.
> * gdb.exp (escape_regex_chars): New.
Seems like you reinvented string_to_regexp.
Thanks,
Pedro Alves
@@ -213,12 +213,13 @@ gdb_test "maint print psymbols" \
if { ! $have_gdb_index } {
set psymbols_output [standard_output_file psymbols_output]
+ set psymbols_output_re [escape_regex_chars $psymbols_output]
send_gdb "maint print psymbols $psymbols_output ${srcdir}/${subdir}/${srcfile}\n"
gdb_expect {
- -re "^maint print psymbols $psymbols_output \[^\n\]*\r\n$gdb_prompt $" {
+ -re "^maint print psymbols $psymbols_output_re \[^\n\]*\r\n$gdb_prompt $" {
send_gdb "shell ls $psymbols_output\n"
gdb_expect {
- -re "$psymbols_output\r\n$gdb_prompt $" {
+ -re "$psymbols_output_re\r\n$gdb_prompt $" {
# We want this grep to be as specific as possible,
# so it's less likely to match symbol file names in
# psymbols_output. Yes, this actually happened;
@@ -253,12 +254,13 @@ gdb_test "maint print msymbols" \
set msymbols_output [standard_output_file msymbols_output]
+set msymbols_output_re [escape_regex_chars $msymbols_output]
send_gdb "maint print msymbols $msymbols_output ${binfile}\n"
gdb_expect {
- -re "^maint print msymbols $msymbols_output \[^\n\]*\r\n$gdb_prompt $" {
+ -re "^maint print msymbols $msymbols_output_re \[^\n\]*\r\n$gdb_prompt $" {
send_gdb "shell ls $msymbols_output\n"
gdb_expect {
- -re "$msymbols_output\r\n$gdb_prompt $" {
+ -re "$msymbols_output_re\r\n$gdb_prompt $" {
send_gdb "shell grep factorial $msymbols_output\n"
gdb_expect {
-re "\\\[ *$decimal\\\] \[tT\]\[ \t\]+$hex \\.?factorial.*$gdb_prompt $" {
@@ -331,12 +333,13 @@ gdb_test "maint print symbols" \
# for GNU libc.
set symbols_output [standard_output_file symbols_output]
+set symbols_output_re [escape_regex_chars $symbols_output]
send_gdb "maint print symbols $symbols_output ${srcdir}/${subdir}/${srcfile}\n"
gdb_expect {
- -re "^maint print symbols $symbols_output \[^\n\]*\r\n$gdb_prompt $" {
+ -re "^maint print symbols $symbols_output_re \[^\n\]*\r\n$gdb_prompt $" {
send_gdb "shell ls $symbols_output\n"
gdb_expect {
- -re "$symbols_output\r\n$gdb_prompt $" {
+ -re "$symbols_output_re\r\n$gdb_prompt $" {
# See comments for `maint print psymbols'.
send_gdb "shell grep 'main(.*block' $symbols_output\n"
gdb_expect {
@@ -294,6 +294,7 @@ gdb_reinitialize_dir $srcdir/$subdir
set binfile [gdb_remote_download host ${binfile} \
[standard_output_file object.o]]
+set binfile_re [escape_regex_chars $binfile]
send_gdb "file $binfile\n"
# If $binfile is very long, a \r (but not a \n) will echo in the
# middle of the echo of the command. So to match the echo, we
@@ -310,7 +311,7 @@ gdb_expect 60 {
send_gdb "y\n"
exp_continue
}
- -re "^Reading symbols from .*$binfile\\.\\.\\.done\.(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)\r\n$gdb_prompt $" {
+ -re "^Reading symbols from .*$binfile_re\\.\\.\\.done\.(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)\r\n$gdb_prompt $" {
pass "weirdx.o read without error"
}
-re ".*$gdb_prompt $" {
@@ -123,6 +123,27 @@ set inferior_exited_re "(\\\[Inferior \[0-9\]+ \\(.*\\) exited)"
### Only procedures should come after this point.
#
+# escape_regex_chars -- escape metacharacters in literal string,
+# so it can be used safely in a regular expression.
+#
+proc escape_regex_chars { line } {
+ return [string map {"^" "\\^"
+ "$" "\\$"
+ "(" "\\("
+ ")" "\\)"
+ "[" "\\["
+ "]" "\\]"
+ "{" "\\{"
+ "}" "\\}"
+ "." "\\."
+ "\\" "\\\\"
+ "?" "\\?"
+ "+" "\\+"
+ "*" "\\*"
+ "|" "\\|"} $line]
+}
+
+#
# gdb_version -- extract and print the version number of GDB
#
proc default_gdb_version {} {