diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-11-04 23:36:29 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-11-04 23:36:29 +0100 |
| commit | e5a3272d32ad52f905ef3e66991871dbef2245e7 (patch) | |
| tree | 2f6dd7e69da69bca230a4b4e42b71d6725fa2fd2 | |
| parent | 2d6d76f9cd3c5dca0676491d7d60ff7685942487 (diff) | |
patch 8.1.2256: test for ":term ++shell" fails on MS-Windowsv8.1.2256
Problem: Test for ":term ++shell" fails on MS-Windows.
Solution: Accept failure of "dir" executable.
| -rw-r--r-- | src/testdir/test_terminal.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index ba179595ab..10e107553f 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -2227,7 +2227,7 @@ func Test_terminal_shell_option() 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', term_getline(bufnr(), 1))}) + call WaitForAssert({-> assert_match('job failed\|cannot access .*: No such file or directory', term_getline(bufnr(), 1))}) bwipe! term ++shell dir /b runtest.vim diff --git a/src/version.c b/src/version.c index 4315a17e9c..182352dc68 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 */ /**/ + 2256, +/**/ 2255, /**/ 2254, |