aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.0.1755: CI still fails with sodium mlock error

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

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt 2023-08-19 22:15:44 +02:00
parent f244b2fbf2
commit 25dec33c9b
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/testdir/test_crypt.vim
View File

@ -332,7 +332,11 @@ func Test_uncrypt_xchacha20_3_persistent_undo()
endtry endtry
call assert_equal(0, &undofile) call assert_equal(0, &undofile)
bw! 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 " should fail
norm! u norm! u
call assert_match('Already at oldest change', execute(':1mess')) call assert_match('Already at oldest change', execute(':1mess'))

2
src/version.c
View File

@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1755,
/**/ /**/
1754, 1754,
/**/ /**/