From: Christian Brabandt <cb@256bit.org>
Date: Mon, 28 Aug 2023 19:17:36 +0000 (+0200)
Subject: patch 9.0.1812: CI still fails with sodium_mlock error()
X-Git-Tag: v9.0.1812
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93ebb5e75e564403624314c84c97293427d001d6;p=thirdparty%2Fvim.git

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 <cb@256bit.org>
---

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
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1812,
 /**/
     1811,
 /**/