Skip to content

Commit 6b1a997

Browse files
committed
tests: interactive.test: fix for posix regex
If using POSIX regex instead of the builtin jim regex, \r and \n character escapes are not supported. Use literal \r and \n instead. Signed-off-by: Steve Bennett <[email protected]>
1 parent 948296d commit 6b1a997

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

tests/interactive.test

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ file delete test_history
3131
wait-for-prompt $p
3232
$p send "history load test_history\r"
3333
# skip echoed output
34-
$p expect {\r\n}
34+
$p expect "\r\n"
3535
wait-for-prompt $p
3636

3737
test interactive-1.1 {basic command} -body {
3838
$p send "lsort \[info commands li*\]\r"
3939
# skip echoed output
40-
$p expect {\r\n}
40+
$p expect "\r\n"
4141
# get command result
42-
$p expect {\r\n}
42+
$p expect "\r\n"
4343
$p before
4444
} -result {lindex linsert list} -cleanup {
4545
wait-for-prompt $p
@@ -57,45 +57,45 @@ test interactive-1.2 {command line completion} lineedit {
5757
$p expect {list} { incr check }
5858
$p send \r
5959
}
60-
$p expect {\r\n}
60+
$p expect "\r\n"
6161
wait-for-prompt $p
6262

6363
list $check $failed
6464
} {3 0}
6565

6666
test interactive-1.3 {history show} -constraints lineedit -body {
6767
$p send "history show\r"
68-
$p expect {\r\n}
69-
$p expect {history show\r\n}
68+
$p expect "\r\n"
69+
$p expect "history show\r\n"
7070
string cat [$p before] [$p after]
7171
} -result " 1 history load test_history\r\n 2 lsort \[info commands li*\]\r\n 3 list\r\n 4 history show\r\n" -cleanup {
7272
wait-for-prompt $p
7373
}
7474

7575
test interactive-1.4 {history getline} -constraints lineedit -body {
7676
$p send "history getline {PROMPT> }\r"
77-
$p expect {\r\n}
77+
$p expect "\r\n"
7878
sleep 0.25
7979
$p send "abc\bd\x01e\r"
80-
$p expect {\r\n}
81-
$p expect {\r\n}
80+
$p expect "\r\n"
81+
$p expect "\r\n"
8282
$p before
8383
} -result {eabd} -cleanup {
8484
wait-for-prompt $p
8585
}
8686

8787
test interactive-1.5 {history getline} -constraints lineedit -body {
8888
$p send "set len \[history getline {PROMPT> } buf\]\r"
89-
$p expect {\r\n}
89+
$p expect "\r\n"
9090
sleep 0.25
9191
$p send "abcde\r"
92-
$p expect {\r\n}
93-
$p expect {\r\n}
92+
$p expect "\r\n"
93+
$p expect "\r\n"
9494
sleep 0.25
9595
$p wait-for-prompt
9696
$p send "list \$len \$buf\r"
97-
$p expect {\r\n}
98-
$p expect {\r\n}
97+
$p expect "\r\n"
98+
$p expect "\r\n"
9999
$p before
100100
} -result {5 abcde} -cleanup {
101101
wait-for-prompt $p
@@ -108,9 +108,9 @@ test interactive-1.6 {insert wide character} -constraints {utf8 lineedit} -body
108108
$p send \x1bOD
109109
$p send y
110110
$p send \r
111-
$p expect {\r\n}
111+
$p expect "\r\n"
112112
sleep 0.25
113-
$p expect {\r\n}
113+
$p expect "\r\n"
114114
$p before
115115
} -result ay\u1100b -cleanup {
116116
wait-for-prompt $p
@@ -123,9 +123,9 @@ test interactive-1.7 {insert utf-8 combining character} -constraints {utf8 linee
123123
$p send \x1bOD
124124
$p send y
125125
$p send \r
126-
$p expect {\r\n}
126+
$p expect "\r\n"
127127
sleep 0.25
128-
$p expect {\r\n}
128+
$p expect "\r\n"
129129
$p before
130130
} -result yx\u0300 -cleanup {
131131
wait-for-prompt $p

0 commit comments

Comments
 (0)