# HG changeset patch # User Christian Brabandt # Date 1505576705 -7200 # Node ID 827ad6758d331ca3576ff00500da5355d5ca31d4 # Parent 6d968a4c1c9c1b1c68ea577aad943a397b0b114f patch 8.0.1117: Test_terminal_no_cmd hangs on MS-Windows with GUI commit https://github.com/vim/vim/commit/e738a1a033cd31cd2568ba99a9e2dca1e65b45ea Author: Bram Moolenaar Date: Sat Sep 16 17:42:41 2017 +0200 patch 8.0.1117: Test_terminal_no_cmd hangs on MS-Windows with GUI 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) diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -547,17 +547,14 @@ func Test_terminal_no_cmd() let pty = job_info(term_getjob(buf))['tty_out'] call assert_notequal('', pty) if has('win32') - silent exe '!cmd /c "echo look here > ' . pty . '"' + silent exe '!start cmd /c "echo look here > ' . pty . '"' else call system('echo "look here" > ' . pty) endif - call term_wait(buf) + let g:buf = buf + call WaitFor('term_getline(g:buf, 1) =~ "look here"') - let result = term_getline(buf, 1) - if has('win32') - let result = substitute(result, '\s\+$', '', '') - endif - call assert_equal('look here', result) + call assert_match('look here', term_getline(buf, 1)) bwipe! endfunc diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1117, +/**/ 1116, /**/ 1115,