From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 5 Nov 2019 21:38:47 +0000 (+0100)
Subject: patch 8.1.2260: terminal test may fail on MS-Windows
X-Git-Tag: v8.1.2260
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36ec6f6953043270630159a61438ce558552fe3a;p=vim

patch 8.1.2260: terminal test may fail on MS-Windows

Problem:    Terminal test may fail on MS-Windows.
Solution:   Catch the situation that "term dir" fails with a CreateProcess
            error.
---

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 10e107553..43a93847a 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 0a210b6ea..4fd069488 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2260,
 /**/
     2259,
 /**/