patch 9.0.1696: sodium_mlock may still fail in CI
Commit:
https://github.com/vim/vim/commit/8878653a441764c0e234c5d7af99a2b3a823bb9b
Author: Christian Brabandt <[email protected]>
Date: Sat Aug 12 09:41:23 2023 +0200
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 <[email protected]>
diff --git a/src/testdir/test_crypt.vim b/src/testdir/test_crypt.vim
index 944f2165b..68e7ca155 100644
--- 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 57830dd9b..5baeaf359 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 */
+/**/
+ 1696,
/**/
1695,
/**/
--
--
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/E1qUjJ2-00FsKM-Fu%40256bit.org.
