patch 9.0.1755: CI still fails with sodium mlock error

Commit: 
https://github.com/vim/vim/commit/25dec33c9bd286eacd1767ce2f5324117132b33a
Author: Christian Brabandt <[email protected]>
Date:   Sat Aug 19 22:15:44 2023 +0200

    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 <[email protected]>

diff --git a/src/testdir/test_crypt.vim b/src/testdir/test_crypt.vim
index 68e7ca155..a5e3b1ab0 100644
--- 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 3611cb20b..b5dae7fd1 100644
--- 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,
 /**/

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/vim_dev/E1qXSaB-009W7e-Po%40256bit.org.

Raspunde prin e-mail lui