Mercurial > vim

changeset 32892:d5f7716fadde v9.0.1755

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.1755: CI still fails with sodium mlock error Commit: https://github.com/vim/vim/commit/25dec33c9bd286eacd1767ce2f5324117132b33a Author: Christian Brabandt <cb@256bit.org> 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 <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Sat, 19 Aug 2023 22:30:03 +0200
parents 2e54ae0568b0
children 4b9becc20f9f
files src/testdir/test_crypt.vim src/version.c
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_crypt.vim
+++ b/src/testdir/test_crypt.vim
@@ -332,7 +332,11 @@ func Test_uncrypt_xchacha20_3_persistent
     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'))
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1755,
+/**/
     1754,
 /**/
     1753,