Mercurial > vim

changeset 32754:71aa45708496 v9.0.1696

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.1696: sodium_mlock may still fail in CI Commit: https://github.com/vim/vim/commit/8878653a441764c0e234c5d7af99a2b3a823bb9b Author: Christian Brabandt <cb@256bit.org> Date: Sat Aug 12 09:41:23 2023 +0200 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 <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Sat, 12 Aug 2023 09:45:03 +0200
parents 62bb6527baf3
children f2b8b8b13971
files src/testdir/test_crypt.vim src/version.c
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_crypt.vim
+++ b/src/testdir/test_crypt.vim
@@ -325,7 +325,11 @@ func Test_uncrypt_xchacha20_3_persistent
     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\<CR>sodium\<CR>", 'xt')
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1696,
+/**/
     1695,
 /**/
     1694,