Permalink
Browse files

patch 8.0.0943: MS-Windows: Test_terminal_scrape_multibyte may fail

Problem:    Test_terminal_scrape_multibyte fails if the codepage is not utf-8.
Solution:   Start "cmd" with the utf-8 codepage. (micbou, closes #1975)
  • Loading branch information...
brammool committed Aug 14, 2017
1 parent 4fa1019 commit 3678393baa2fbfcd5020fcf0ac12947fc485e912
Showing with 13 additions and 5 deletions.
  1. +11 −5 src/testdir/test_terminal.vim
  2. +2 −0 src/version.c
@@ -185,14 +185,19 @@ func Test_terminal_scrape_multibyte()
endif
call writefile(["léttまrs"], 'Xtext')
if has('win32')
let cmd = 'cmd /c "type Xtext"'
" Run cmd with UTF-8 codepage to make the type command print the expected
" multibyte characters.
let g:buf = term_start("cmd /K chcp 65001")
call term_sendkeys(g:buf, "type Xtext\<CR>")
call term_sendkeys(g:buf, "exit\<CR>")
let g:line = 4
else
let cmd = "cat Xtext"
let g:buf = term_start("cat Xtext")
let g:line = 1
endif
let g:buf = term_start(cmd)
call WaitFor('term_scrape(g:buf, 1)[0].chars == "l"')
let l = term_scrape(g:buf, 1)
call WaitFor('term_scrape(g:buf, g:line)[0].chars == "l"')
let l = term_scrape(g:buf, g:line)
call assert_true(len(l) >= 7)
call assert_equal('l', l[0].chars)
call assert_equal('é', l[1].chars)
@@ -210,6 +215,7 @@ func Test_terminal_scrape_multibyte()
exe g:buf . 'bwipe'
unlet g:buf
unlet g:line
call delete('Xtext')
endfunc
View
@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
943,
/**/
942,
/**/

0 comments on commit 3678393

Please sign in to comment.