summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-03-10 21:46:39 +0100
committerBram Moolenaar <Bram@vim.org>2021-03-10 21:46:39 +0100
commit6635ae1437e6e343c0514524a8dfb19d9525b908 (patch)
treec14cebf7436e087d3c036bc5279af577de57b965
parentf52f0606ed9ea19bcfc3a8343af9958f2d99eaf7 (diff)
downloadvim-git-6635ae1437e6e343c0514524a8dfb19d9525b908.tar.gz
patch 8.2.2587: recover test fails on FreeBSDv8.2.2587
Problem: Recover test fails on FreeBSD. Solution: Check for Linux.
-rw-r--r--src/testdir/check.vim10
-rw-r--r--src/testdir/test_recover.vim5
-rw-r--r--src/version.c2
3 files changed, 14 insertions, 3 deletions
diff --git a/src/testdir/check.vim b/src/testdir/check.vim
index e5298bc53..db16cfb7d 100644
--- 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')
diff --git a/src/testdir/test_recover.vim b/src/testdir/test_recover.vim
index 621e3152c..28676632c 100644
--- 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
diff --git a/src/version.c b/src/version.c
index b624a71e1..df8d2f917 100644
--- 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,