diff options
| author | Christian Brabandt <cb@256bit.org> | 2023-08-28 21:17:36 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-08-28 21:17:36 +0200 |
| commit | 93ebb5e75e564403624314c84c97293427d001d6 (patch) | |
| tree | a5d0bf2da174e84db9c742047d9e9e17aac93551 | |
| parent | 85c3a5bc265393c1b8b93d8b88b936d3b8b4aec7 (diff) | |
patch 9.0.1812: CI still fails with sodium_mlock error()v9.0.1812
Problem: CI still fails with sodium_mlock error()
Solution: Catch and ignore E1230 error in test_crypt
closes: #12939
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/testdir/test_crypt.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/testdir/test_crypt.vim b/src/testdir/test_crypt.vim index a5e3b1ab0e..e2eaed889d 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\%((\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 e708bdd4a7..46f2676a10 100644 --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1812, +/**/ 1811, /**/ 1810, |