diff options
| author | Siri Hansen <[email protected]> | 2017-09-07 17:34:58 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2017-09-07 17:34:58 +0200 |
| commit | 695ce64b3168c3fcc2d5f2de5cb74701f767e71d (patch) | |
| tree | 153c3af70c221a063844e922d29c11ee9b82b64e /lib/common_test/src/ct_telnet.erl | |
| parent | f4c24c5faba8cbf0817b4dd9559e2ae2223525f0 (diff) | |
| parent | b569db7fd80de6f6f049797fa7676bdfbe55cc4f (diff) | |
| download | otp-695ce64b3168c3fcc2d5f2de5cb74701f767e71d.tar.gz otp-695ce64b3168c3fcc2d5f2de5cb74701f767e71d.tar.bz2 otp-695ce64b3168c3fcc2d5f2de5cb74701f767e71d.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/common_test/src/ct_telnet.erl')
| -rw-r--r-- | lib/common_test/src/ct_telnet.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/common_test/src/ct_telnet.erl b/lib/common_test/src/ct_telnet.erl index 14d9d381da..b50cddd492 100644 --- a/lib/common_test/src/ct_telnet.erl +++ b/lib/common_test/src/ct_telnet.erl @@ -1455,7 +1455,7 @@ match_line(Name,Pid,Line,[{prompt,PromptType}|Patterns],FoundPrompt,Term, when PromptType=/=FoundPrompt -> match_line(Name,Pid,Line,Patterns,FoundPrompt,Term,EO,RetTag); match_line(Name,Pid,Line,[{Tag,Pattern}|Patterns],FoundPrompt,Term,EO,RetTag) -> - case re:run(Line,Pattern,[{capture,all,list}]) of + case re:run(Line,Pattern,[{capture,all,list},unicode]) of nomatch -> match_line(Name,Pid,Line,Patterns,FoundPrompt,Term,EO,RetTag); {match,Match} -> @@ -1463,7 +1463,7 @@ match_line(Name,Pid,Line,[{Tag,Pattern}|Patterns],FoundPrompt,Term,EO,RetTag) -> {RetTag,{Tag,Match}} end; match_line(Name,Pid,Line,[Pattern|Patterns],FoundPrompt,Term,EO,RetTag) -> - case re:run(Line,Pattern,[{capture,all,list}]) of + case re:run(Line,Pattern,[{capture,all,list},unicode]) of nomatch -> match_line(Name,Pid,Line,Patterns,FoundPrompt,Term,EO,RetTag); {match,Match} -> @@ -1575,7 +1575,7 @@ split_lines([],Line,Lines) -> match_prompt(Str,Prx) -> match_prompt(Str,Prx,[]). match_prompt(Str,Prx,Acc) -> - case re:run(Str,Prx) of + case re:run(Str,Prx,[unicode]) of nomatch -> noprompt; {match,[{Start,Len}]} -> |