To: vim_dev@googlegroups.com Subject: Patch 8.1.2260 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2260 Problem: Terminal test may fail on MS-Windows. Solution: Catch the situation that "term dir" fails with a CreateProcess error. Files: src/testdir/test_terminal.vim *** ../vim-8.1.2259/src/testdir/test_terminal.vim 2019-11-04 23:36:26.371298800 +0100 --- src/testdir/test_terminal.vim 2019-11-05 22:35:54.248444162 +0100 *************** *** 2226,2233 **** 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))}) bwipe! term ++shell dir /b runtest.vim --- 2226,2237 ---- bwipe! elseif has('win32') " dir is a shell builtin command, should fail without a shell. ! 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 *** ../vim-8.1.2259/src/version.c 2019-11-05 22:37:16.978108287 +0100 --- src/version.c 2019-11-05 22:38:19.809869043 +0100 *************** *** 743,744 **** --- 743,746 ---- { /* Add new patch number below this line */ + /**/ + 2260, /**/ -- Q. What happens to programmers when they die? A: MS-Windows programmers are reinstalled. C++ programmers become undefined, anyone who refers to them will die as well. Java programmers reincarnate after being garbage collected, unless they are in permgen, in which case they become zombies. Zimbu programmers leave a stack trace that tells us exactly where they died and how they got there. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///