From 9f49a101174911d8672c55cdc379ac5a3db186ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 9 Jan 2010 12:46:49 +0200 Subject: [PATCH] (testsuite) Escape more regexp metacharacters. --- test/lib/library.exp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/lib/library.exp b/test/lib/library.exp index ecea3dd2..fe8d7e22 100644 --- a/test/lib/library.exp +++ b/test/lib/library.exp @@ -221,7 +221,7 @@ proc assert_complete_any {cmd {test ""} {prompt /@}} { send "$cmd\t" expect -ex "$cmd" # Escape special regexp characters - regsub -all {([\[\]\(\)\.\\\+])} $cmd {\\\1} cmd + regsub -all {([\^$+*?.|(){}[\]\\])} $cmd {\\\1} cmd expect { -timeout 1 # Match completions, multiple words @@ -506,8 +506,8 @@ proc match_items {items test {prompt /@} {size 20}} { set expected "" for {set j 0} {$j < $size && $i + $j < [llength $items]} {incr j} { set item "[lindex $items [expr {$i + $j}]]" - # Escape special regexp characters ([]().\*^$) - regsub -all {([\[\]\(\)\.\\\+\*\^\$])} $item {\\\1} item + # Escape special regexp characters + regsub -all {([\^$+*?.|(){}[\]\\])} $item {\\\1} item append expected $item if {[llength $items] > 1} {append expected {\s+}}; }; # for