From 6635ae1437e6e343c0514524a8dfb19d9525b908 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 10 Mar 2021 21:46:39 +0100 Subject: [PATCH] patch 8.2.2587: recover test fails on FreeBSD Problem: Recover test fails on FreeBSD. Solution: Check for Linux. --- src/testdir/check.vim | 10 +++++++++- src/testdir/test_recover.vim | 5 +++-- src/version.c | 2 ++ 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 @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2587, /**/ 2586, /**/ -- 2.50.1