Skip to content

Commit

Permalink
patch 8.0.1117: Test_terminal_no_cmd hangs on MS-Windows with GUI
Browse files Browse the repository at this point in the history
Problem:    Test_terminal_no_cmd hangs on MS-Windows with GUI. (Christian
            Brabandt)
Solution:   Run the command with "start" and wait for the text to appear.
            (micbou, closes #2096)
  • Loading branch information
brammool committed Sep 16, 2017
1 parent 1514e8f commit e738a1a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
11 changes: 4 additions & 7 deletions src/testdir/test_terminal.vim
Expand Up @@ -547,17 +547,14 @@ func Test_terminal_no_cmd()
let pty = job_info(term_getjob(buf))['tty_out'] let pty = job_info(term_getjob(buf))['tty_out']
call assert_notequal('', pty) call assert_notequal('', pty)
if has('win32') if has('win32')
silent exe '!cmd /c "echo look here > ' . pty . '"' silent exe '!start cmd /c "echo look here > ' . pty . '"'
else else
call system('echo "look here" > ' . pty) call system('echo "look here" > ' . pty)
endif endif
call term_wait(buf) let g:buf = buf
call WaitFor('term_getline(g:buf, 1) =~ "look here"')


let result = term_getline(buf, 1) call assert_match('look here', term_getline(buf, 1))
if has('win32')
let result = substitute(result, '\s\+$', '', '')
endif
call assert_equal('look here', result)
bwipe! bwipe!
endfunc endfunc


Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -769,6 +769,8 @@ static char *(features[]) =


static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1117,
/**/ /**/
1116, 1116,
/**/ /**/
Expand Down

0 comments on commit e738a1a

Please sign in to comment.