patch 8.2.2627: no need to check for BSD after checking for not rootv8.2.2627

Problem:    No need to check for BSD after checking for not root.
Solution:   Remove CheckNotBSD. (Ozaki Kiichi, closes #7989)

4 files changed, 2 insertions, 12 deletions

diff --git a/src/testdir/check.vim b/src/testdir/check.vim
index 4fe130b7bf..6190399e5d 100644
--- a/src/testdir/check.vim
+++ b/src/testdir/check.vim
@@ -92,15 +92,6 @@ func CheckLinux()
   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')
-    throw 'Skipped: does not work on BSD'
-  endif
-endfunc
-
 " Command to check that making screendumps is supported.
 " Caller must source screendump.vim
 command CheckScreendump call CheckScreendump()
diff --git a/src/testdir/test_excmd.vim b/src/testdir/test_excmd.vim
index cbeedfa8f2..8aace51cb4 100644
--- a/src/testdir/test_excmd.vim
+++ b/src/testdir/test_excmd.vim
@@ -364,7 +364,6 @@ endfunc
 
 func Test_redir_cmd_readonly()
   CheckNotRoot
-  CheckNotBSD
 
   " Redirecting to a read-only file
   call writefile([], 'Xfile')
diff --git a/src/testdir/test_help.vim b/src/testdir/test_help.vim
index b3e3c557fb..ff2bc41b7a 100644
--- a/src/testdir/test_help.vim
+++ b/src/testdir/test_help.vim
@@ -100,8 +100,6 @@ endfunc
 func Test_helptag_cmd_readonly()
   CheckUnix
   CheckNotRoot
-  " The following tests fail on FreeBSD for some reason
-  CheckNotBSD
 
   " Read-only tags file
   call mkdir('Xdir/doc', 'p')
diff --git a/src/version.c b/src/version.c
index bd72953aa6..7c4db55a6b 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 */
 /**/
+    2627,
+/**/
     2626,
 /**/
     2625,