Mercurial > vim

changeset 24091:12a773f4f62f v8.2.2587

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.2587: recover test fails on FreeBSD Commit: https://github.com/vim/vim/commit/6635ae1437e6e343c0514524a8dfb19d9525b908 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Mar 10 21:46:39 2021 +0100 patch 8.2.2587: recover test fails on FreeBSD Problem: Recover test fails on FreeBSD. Solution: Check for Linux.
author Bram Moolenaar <Bram@vim.org>
date Wed, 10 Mar 2021 22:00:03 +0100
parents ecd6f702cbce
children f6482a5454ab
files src/testdir/check.vim src/testdir/test_recover.vim src/version.c
diffstat 3 files changed, 14 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/check.vim
+++ b/src/testdir/check.vim
@@ -84,8 +84,16 @@ func CheckUnix()
   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 checks should not be needed
+" TODO: using this check should not be needed
 command CheckNotBSD call CheckNotBSD()
 func CheckNotBSD()
   if has('bsd')
--- a/src/testdir/test_recover.vim
+++ b/src/testdir/test_recover.vim
@@ -79,8 +79,9 @@ func Test_swap_file()
 endfunc
 
 func Test_nocatch_process_still_running()
-  " assume Unix means sysinfo.uptime can be used
-  CheckUnix
+  " sysinfo.uptime probably only works on Linux
+  CheckLinux
+  " the GUI dialog can't be handled
   CheckNotGui
 
   " don't intercept existing swap file here
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2587,
+/**/
     2586,
 /**/
     2585,