From 066b12e36c32a87725303c0f71e968eb3f9a9f32 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 28 Jul 2020 21:40:27 +0200 Subject: patch 8.2.1312: MS-Windows: terminal test may fail if dir.exe exists Problem: MS-Windows: terminal test may fail if dir.exe exists. Solution: Use dir.com. (Ken Takata, closes #6557) --- src/testdir/test_terminal3.vim | 9 ++++++--- src/version.c | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/testdir/test_terminal3.vim b/src/testdir/test_terminal3.vim index 76e8a1054..3343dafd8 100644 --- a/src/testdir/test_terminal3.vim +++ b/src/testdir/test_terminal3.vim @@ -43,15 +43,18 @@ func Test_terminal_shell_option() bwipe! elseif has('win32') " dir is a shell builtin command, should fail without a shell. + " However, if dir.exe (which might be provided by Cygwin/MSYS2) exists in + " the %PATH%, "term dir" succeeds unintentionally. Use dir.com instead. try - term dir /b runtest.vim - call WaitForAssert({-> assert_match('job failed\|cannot access .*: No such file or directory', term_getline(bufnr(), 1))}) + term dir.com /b runtest.vim + call WaitForAssert({-> assert_match('job failed', term_getline(bufnr(), 1))}) catch /CreateProcess/ " ignore endtry bwipe! - term ++shell dir /b runtest.vim + " This should execute the dir builtin command even with ".com". + term ++shell dir.com /b runtest.vim call WaitForAssert({-> assert_match('runtest.vim', term_getline(bufnr(), 1))}) bwipe! endif diff --git a/src/version.c b/src/version.c index 93da0a8ab..26bd7ac65 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1312, /**/ 1311, /**/ -- cgit v1.2.1