(testsuite) Escape more regexp metacharacters.

This commit is contained in:
Ville Skyttä 2010-01-09 12:46:49 +02:00
parent 66f5c11ab7
commit 9f49a10117

View File

@ -221,7 +221,7 @@ proc assert_complete_any {cmd {test ""} {prompt /@}} {
send "$cmd\t" send "$cmd\t"
expect -ex "$cmd" expect -ex "$cmd"
# Escape special regexp characters # Escape special regexp characters
regsub -all {([\[\]\(\)\.\\\+])} $cmd {\\\1} cmd regsub -all {([\^$+*?.|(){}[\]\\])} $cmd {\\\1} cmd
expect { expect {
-timeout 1 -timeout 1
# Match completions, multiple words # Match completions, multiple words
@ -506,8 +506,8 @@ proc match_items {items test {prompt /@} {size 20}} {
set expected "" set expected ""
for {set j 0} {$j < $size && $i + $j < [llength $items]} {incr j} { for {set j 0} {$j < $size && $i + $j < [llength $items]} {incr j} {
set item "[lindex $items [expr {$i + $j}]]" set item "[lindex $items [expr {$i + $j}]]"
# Escape special regexp characters ([]().\*^$) # Escape special regexp characters
regsub -all {([\[\]\(\)\.\\\+\*\^\$])} $item {\\\1} item regsub -all {([\^$+*?.|(){}[\]\\])} $item {\\\1} item
append expected $item append expected $item
if {[llength $items] > 1} {append expected {\s+}}; if {[llength $items] > 1} {append expected {\s+}};
}; # for }; # for