From e5a3272d32ad52f905ef3e66991871dbef2245e7 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 4 Nov 2019 23:36:29 +0100 Subject: [PATCH] patch 8.1.2256: test for ":term ++shell" fails on MS-Windows Problem: Test for ":term ++shell" fails on MS-Windows. Solution: Accept failure of "dir" executable. --- src/testdir/test_terminal.vim | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index ba179595a..10e107553 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 4315a17e9..182352dc6 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 */ +/**/ + 2256, /**/ 2255, /**/ -- 2.50.1