patch 9.0.1812: CI still fails with sodium_mlock error()
Commit:
https://github.com/vim/vim/commit/93ebb5e75e564403624314c84c97293427d001d6
Author: Christian Brabandt <[email protected]>
Date: Mon Aug 28 21:17:36 2023 +0200
patch 9.0.1812: CI still fails with sodium_mlock error()
Problem: CI still fails with sodium_mlock error()
Solution: Catch and ignore E1230 error in test_crypt
closes: #12939
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/testdir/test_crypt.vim b/src/testdir/test_crypt.vim
index a5e3b1ab0..e2eaed889 100644
--- a/src/testdir/test_crypt.vim
+++ b/src/testdir/test_crypt.vim
@@ -290,7 +290,11 @@ func Test_uncrypt_xchacha20v2_2()
" encrypted using xchacha20
call assert_match("\[xchachav2\]", execute(':messages'))
bw!
- call feedkeys(":verbose :sp Xcrypt_sodium_v2.txt\<CR>sodium\<CR>", 'xt')
+ try
+ call feedkeys(":verbose :sp
Xcrypt_sodium_v2.txt\<CR>sodium\<CR>", 'xt')
+ catch /^Vim\%(( \+)\)\=:E1230:/ " sodium_mlock() not possible, may happen at
Github CI
+ throw 'Skipped: sodium_mlock() not possible'
+ endtry
" successfully decrypted
call assert_equal(range(1, 4000)->map( {_, v -> string(v)}), getline(1,'$'))
call assert_match('xchacha20v2: using default \w\+ "\d\+" for Key
derivation.', execute(':messages'))
diff --git a/src/version.c b/src/version.c
index e708bdd4a..46f2676a1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1812,
/**/
1811,
/**/
--
--
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/E1qahw6-00515t-EM%40256bit.org.
