patch 9.0.1696: sodium_mlock may still fail in CI

Problem: sodium_mlock may still fail in CI
Solution: Catch E1230 in testscript and skip test

Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/testdir/test_crypt.vim b/src/testdir/test_crypt.vim
index 944f2165bbabdd7a84ed39b080c8d7c7bf9fd9cb..68e7ca15584751e8a6cc97bca8929d0dbdb3218a 100644 (file)
--- a/src/testdir/test_crypt.vim
+++ b/src/testdir/test_crypt.vim
@@ -325,7 +325,11 @@ func Test_uncrypt_xchacha20_3_persistent_undo()
     set undolevels=100
     normal dd
     set undolevels=100
-    w!
+    try
+      w!
+    catch /^Vim\%((\a\+)\)\=:E1230:/ " sodium_mlock() not possible, may happen at Github CI
+    throw 'Skipped: sodium_mlock() not possible'
+    endtry
     call assert_equal(0, &undofile)
     bw!
     call feedkeys(":sp Xcrypt_sodium_undo.txt\<CR>sodium\<CR>", 'xt')

diff --git a/src/version.c b/src/version.c
index 57830dd9b98c4c65b027df8c4f7ef5873008c848..5baeaf3594f639add369789af8e67326b28da415 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1696,
 /**/
     1695,
 /**/