From 93ebb5e75e564403624314c84c97293427d001d6 Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Mon, 28 Aug 2023 21:17:36 +0200 Subject: [PATCH] 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 --- 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 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\sodium\", 'xt') + try + call feedkeys(":verbose :sp Xcrypt_sodium_v2.txt\sodium\", 'xt') + catch /^Vim\%((\a\+)\)\=: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, /**/