To: vim_dev@googlegroups.com Subject: Patch 8.2.2589 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2589 (after 8.2.2586) Problem: Recover test hangs in the GUI. Solution: Add g:skipped_reason to skip a _nocatch_ test. Files: src/testdir/runtest.vim, src/testdir/test_recover.vim *** ../vim-8.2.2588/src/testdir/runtest.vim 2020-11-21 21:41:36.182011155 +0100 --- src/testdir/runtest.vim 2021-03-10 22:21:59.774431259 +0100 *************** *** 196,202 **** --- 196,207 ---- if a:test =~ 'Test_nocatch_' " Function handles errors itself. This avoids skipping commands after the " error. + let g:skipped_reason = '' exe 'call ' . a:test + if g:skipped_reason != '' + call add(s:messages, ' Skipped') + call add(s:skipped, 'SKIPPED ' . a:test . ': ' . g:skipped_reason) + endif else try au VimLeavePre * call EarlyExit(g:testfunc) *** ../vim-8.2.2588/src/testdir/test_recover.vim 2021-03-10 21:46:35.498399355 +0100 --- src/testdir/test_recover.vim 2021-03-10 22:27:30.737764999 +0100 *************** *** 80,88 **** func Test_nocatch_process_still_running() " sysinfo.uptime probably only works on Linux ! CheckLinux " the GUI dialog can't be handled ! CheckNotGui " don't intercept existing swap file here au! SwapExists --- 80,94 ---- func Test_nocatch_process_still_running() " sysinfo.uptime probably only works on Linux ! if !has('linux') ! let g:skipped_reason = 'only works on Linux' ! return ! endif " the GUI dialog can't be handled ! if has('gui_running') ! let g:skipped_reason = 'only works in the terminal' ! return ! endif " don't intercept existing swap file here au! SwapExists *** ../vim-8.2.2588/src/version.c 2021-03-10 21:55:42.729459602 +0100 --- src/version.c 2021-03-10 22:23:27.990253920 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2589, /**/ -- ARTHUR: Be quiet! I order you to shut up. OLD WOMAN: Order, eh -- who does he think he is? ARTHUR: I am your king! OLD WOMAN: Well, I didn't vote for you. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// 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 ///