diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-11-05 22:38:47 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-11-05 22:38:47 +0100 |
| commit | 36ec6f6953043270630159a61438ce558552fe3a (patch) | |
| tree | 8654e807915ec41f7395fe827bd39c8e759f524b | |
| parent | 7d2320414ffdd698c9a17d775f71e2c455c21624 (diff) | |
patch 8.1.2260: terminal test may fail on MS-Windowsv8.1.2260
Problem: Terminal test may fail on MS-Windows.
Solution: Catch the situation that "term dir" fails with a CreateProcess
error.
| -rw-r--r-- | src/testdir/test_terminal.vim | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index 10e107553f..43a93847a9 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -2226,8 +2226,12 @@ func Test_terminal_shell_option() bwipe! elseif has('win32') " dir is a shell builtin command, should fail without a shell. - term dir /b runtest.vim - call WaitForAssert({-> assert_match('job failed\|cannot access .*: No such file or directory', term_getline(bufnr(), 1))}) + try + 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! term ++shell dir /b runtest.vim diff --git a/src/version.c b/src/version.c index 0a210b6ea4..4fd069488a 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2260, +/**/ 2259, /**/ 2258, |