]> granicus.if.org Git - vim/commitdiff
patch 8.1.2256: test for ":term ++shell" fails on MS-Windows v8.1.2256
authorBram Moolenaar <Bram@vim.org>
Mon, 4 Nov 2019 22:36:29 +0000 (23:36 +0100)
committerBram Moolenaar <Bram@vim.org>
Mon, 4 Nov 2019 22:36:29 +0000 (23:36 +0100)
Problem:    Test for ":term ++shell" fails on MS-Windows.
Solution:   Accept failure of "dir" executable.

src/testdir/test_terminal.vim
src/version.c

index ba179595ab3ec5784110cf0d5eee83125570eb1a..10e107553f2aaad035adfe1094c371b837ca7d9b 100644 (file)
@@ -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
index 4315a17e9c8ddb8805a671af3581633c83025ad2..182352dc68ac7fea000a94fb896a69cb1eca1a04 100644 (file)
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2256,
 /**/
     2255,
 /**/