patch 9.2.0695: Solaris: test_delete_temp_dir() fails because of missing flock

Problem:  Solaris: test_delete_temp_dir() fails because of missing flock
Solution: Skip the test (Vladimír Marek)

Test_delete_temp_dir() assumes Vim can detect when its cached private temp
directory has been deleted, which depends on flock/dirfd support.  Solaris
does not provide flock(), so Vim keeps using the cached temp directory path
after the directory has been deleted.  Skip the test there.

closes: #20567

Signed-off-by: Vladimír Marek <vlmarek13@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim
index d9ba550f978cb1270d1460e564eec8e29b8cc6c4..da94dad7b8701cc822a85f5ed4a7810d6289599e 100644 (file)
--- a/src/testdir/test_vimscript.vim
+++ b/src/testdir/test_vimscript.vim
@@ -7734,6 +7734,9 @@ func Test_delete_temp_dir()
   " assumes Unix has always flock/dirfd support
   CheckUnix
   CheckNotMac
+  if has('sun')
+    throw 'Skipped: Solaris Vim does not detect deleted tempdir without flock()'
+  endif
   let a = tempname()
   let dir = fnamemodify(a, ':h')
   call delete(dir, 'rf')

diff --git a/src/version.c b/src/version.c
index 0f7c67d29078a194bedf88d76a316c964d97cf2b..c1e5a940732e6f0af5420355ebe3e716466d1828 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    695,
 /**/
     694,
 /**/