To: vim_dev@googlegroups.com Subject: Patch 8.2.2587 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2587 (after 8.2.2586) Problem: Recover test fails on FreeBSD. Solution: Check for Linux. Files: src/testdir/check.vim, src/testdir/test_recover.vim *** ../vim-8.2.2586/src/testdir/check.vim 2021-01-28 18:34:27.783630494 +0100 --- src/testdir/check.vim 2021-03-10 21:43:55.898733453 +0100 *************** *** 84,91 **** endif endfunc " Command to check for not running on a BSD system. ! " TODO: using this checks should not be needed command CheckNotBSD call CheckNotBSD() func CheckNotBSD() if has('bsd') --- 84,99 ---- endif endfunc + " Command to check for running on Linix + command CheckLinux call CheckLinux() + func CheckLinux() + if !has('linux') + throw 'Skipped: only works on Linux' + endif + endfunc + " Command to check for not running on a BSD system. ! " TODO: using this check should not be needed command CheckNotBSD call CheckNotBSD() func CheckNotBSD() if has('bsd') *** ../vim-8.2.2586/src/testdir/test_recover.vim 2021-03-10 21:26:34.152867581 +0100 --- src/testdir/test_recover.vim 2021-03-10 21:45:41.886511692 +0100 *************** *** 79,86 **** endfunc func Test_nocatch_process_still_running() ! " assume Unix means sysinfo.uptime can be used ! CheckUnix CheckNotGui " don't intercept existing swap file here --- 79,87 ---- endfunc 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 *** ../vim-8.2.2586/src/version.c 2021-03-10 21:26:34.152867581 +0100 --- src/version.c 2021-03-10 21:44:43.434633990 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2587, /**/ -- ARTHUR: ... and I am your king .... OLD WOMAN: Ooooh! I didn't know we had a king. I thought we were an autonomous collective ... "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 ///