patch 8.2.3496: crypt test fails if xxd was not installed yet
Problem: Crypt test fails on MS-Windows if xxd was not installed yet.
Solution: Use the just built xxd executable if it exists. (James McCoy,
closes #8929)
diff --git a/src/testdir/test_crypt.vim b/src/testdir/test_crypt.vim
index 2e34c80..f43c22a 100644
--- a/src/testdir/test_crypt.vim
+++ b/src/testdir/test_crypt.vim
@@ -3,6 +3,13 @@
source check.vim
CheckFeature cryptv
+let s:xxd_cmd = ''
+if empty($XXDPROG) && executable('..\xxd\xxd.exe')
+ let s:xxd_cmd = '..\xxd\xxd.exe'
+elseif !empty($XXDPROG) && executable($XXDPROG)
+ let s:xxd_cmd = $XXDPROG
+endif
+
func Common_head_only(text)
" This was crashing Vim
split Xtest.txt
@@ -81,8 +88,11 @@
endfunc
func Uncrypt_stable_xxd(method, hex, key, uncrypted_text)
+ if empty(s:xxd_cmd)
+ throw 'Skipped: xxd program missing'
+ endif
" use xxd to write the binary content
- call system('xxd -r >Xtest.txt', a:hex)
+ call system(s:xxd_cmd .. ' -r >Xtest.txt', a:hex)
call feedkeys(":split Xtest.txt\<CR>" . a:key . "\<CR>", 'xt')
call assert_equal(a:uncrypted_text, getline(1, len(a:uncrypted_text)))
bwipe!
diff --git a/src/version.c b/src/version.c
index 2ef2946..8a97806 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3496,
+/**/
3495,
/**/
3494,