aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-13 06:54:15 -04:00
Code Activity

patch 8.1.2260: terminal test may fail on MS-Windows

Browse Source 
Problem:    Terminal test may fail on MS-Windows.
Solution:   Catch the situation that "term dir" fails with a CreateProcess
            error.
This commit is contained in:
Bram Moolenaar
2019-11-05 22:38:47 +01:00
parent 7d2320414f
commit 36ec6f6953
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/testdir/test_terminal.vim
View File

@@ -2226,8 +2226,12 @@ func Test_terminal_shell_option()
bwipe! bwipe!
elseif has('win32') elseif has('win32')
" dir is a shell builtin command, should fail without a shell. " dir is a shell builtin command, should fail without a shell.
term dir /b runtest.vim try
call WaitForAssert({-> assert_match('job failed\|cannot access .*: No such file or directory', term_getline(bufnr(), 1))}) term dir /b runtest.vim
call WaitForAssert({-> assert_match('job failed\|cannot access .*: No such file or directory', term_getline(bufnr(), 1))})
catch /CreateProcess/
" ignore
endtry
bwipe! bwipe!
term ++shell dir /b runtest.vim term ++shell dir /b runtest.vim

2
src/version.c
View File

@@ -741,6 +741,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 */
/**/
2260,
/**/ /**/
2259, 2259,
/**/ /**/