diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-09-16 17:42:41 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-09-16 17:42:41 +0200 |
| commit | e738a1a033cd31cd2568ba99a9e2dca1e65b45ea (patch) | |
| tree | 6aac1b0763bbc7e0b43e23ef0de75b72f50feca8 | |
| parent | 1514e8f4271d0039740b968a9f7d0d7f81a262a2 (diff) | |
patch 8.0.1117: Test_terminal_no_cmd hangs on MS-Windows with GUIv8.0.1117
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)
| -rw-r--r-- | src/testdir/test_terminal.vim | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index 96edf41ca4..a4031cedf1 100644 --- 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 index ba32ecbc5d..20a81f9dd1 100644 --- 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, |