patch 9.0.1755: CI still fails with sodium mlock error

Problem: CI still fails with sodium mlock error
Solution: catch mlock failure

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

diff --git a/src/testdir/test_crypt.vim b/src/testdir/test_crypt.vim
index 68e7ca15584751e8a6cc97bca8929d0dbdb3218a..a5e3b1ab0ede86142ae08509a167b53928107fdd 100644 (file)
--- a/src/testdir/test_crypt.vim
+++ b/src/testdir/test_crypt.vim
@@ -332,7 +332,11 @@ func Test_uncrypt_xchacha20_3_persistent_undo()
     endtry
     call assert_equal(0, &undofile)
     bw!
-    call feedkeys(":sp Xcrypt_sodium_undo.txt\<CR>sodium\<CR>", 'xt')
+    try
+      call feedkeys(":sp Xcrypt_sodium_undo.txt\<CR>sodium\<CR>", 'xt')
+    catch /^Vim\%((\a\+)\)\=:E1230:/ " sodium_mlock() not possible, may happen at Github CI
+    throw 'Skipped: sodium_mlock() not possible'
+    endtry
     " should fail
     norm! u
     call assert_match('Already at oldest change', execute(':1mess'))

diff --git a/src/version.c b/src/version.c
index 3611cb20ba1af2237200cd3a0346a6d177f45bc3..b5dae7fd1981927be189016ab8b4f9fc41fb455d 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 */
+/**/
+    1755,
 /**/
     1754,
 /**/