Mercurial > vim

changeset 18532:6fe1d322710d v8.1.2260

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.2260: terminal test may fail on MS-Windows Commit: https://github.com/vim/vim/commit/36ec6f6953043270630159a61438ce558552fe3a Author: Bram Moolenaar <Bram@vim.org> Date: Tue Nov 5 22:38:47 2019 +0100 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.
author Bram Moolenaar <Bram@vim.org>
date Tue, 05 Nov 2019 22:45:04 +0100
parents 352597fa076b
children ec5306efdc01
files src/testdir/test_terminal.vim src/version.c
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,