diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-28 21:40:27 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-28 21:40:27 +0200 |
| commit | 066b12e36c32a87725303c0f71e968eb3f9a9f32 (patch) | |
| tree | 4ce6b5d850fed14371e45f36f772cd82e9f3fa85 /src/testdir | |
| parent | 68e30449a2954557d6542fdc2ccea32d4f8ddf9d (diff) | |
patch 8.2.1312: MS-Windows: terminal test may fail if dir.exe existsv8.2.1312
Problem: MS-Windows: terminal test may fail if dir.exe exists.
Solution: Use dir.com. (Ken Takata, closes #6557)
Diffstat (limited to 'src/testdir')
| -rw-r--r-- | src/testdir/test_terminal3.vim | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/testdir/test_terminal3.vim b/src/testdir/test_terminal3.vim index 76e8a10543..3343dafd86 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 |