From 8878653a441764c0e234c5d7af99a2b3a823bb9b Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Sat, 12 Aug 2023 09:41:23 +0200 Subject: [PATCH] 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 --- 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 944f2165bb..68e7ca1558 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\sodium\", 'xt') diff --git a/src/version.c b/src/version.c index 57830dd9b9..5baeaf3594 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, /**/ -- 2.47.2