From 25dec33c9bd286eacd1767ce2f5324117132b33a Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Sat, 19 Aug 2023 22:15:44 +0200 Subject: [PATCH] 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 --- src/testdir/test_crypt.vim | 6 +++++- src/version.c | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_crypt.vim b/src/testdir/test_crypt.vim index 68e7ca1558..a5e3b1ab0e 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\sodium\", 'xt') + try + call feedkeys(":sp Xcrypt_sodium_undo.txt\sodium\", '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 3611cb20ba..b5dae7fd19 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, /**/