thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.0852: crypt test is skipped if xxd is not found

Browse Source 
Problem:    Crypt test is skipped if xxd is not found.
Solution:   Find xxd where it was supposed to be build.
This commit is contained in:
Bram Moolenaar
2022-11-10 00:25:05 +00:00
parent 1d139a012e
commit 90e66ec1e1
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/testdir/test_crypt.vim
View File

@@ -3,11 +3,20 @@
source check.vim source check.vim
CheckFeature cryptv CheckFeature cryptv
let s:xxd_cmd = '' " Use the xxd command from:
if empty($XXDPROG) && executable('..\xxd\xxd.exe') " 1: $XXDPROG if set and it is executable
let s:xxd_cmd = '..\xxd\xxd.exe' " 2: the ../xxd directory if the executable is found there
elseif !empty($XXDPROG) && executable($XXDPROG) if !empty($XXDPROG) && executable($XXDPROG)
let s:xxd_cmd = $XXDPROG let s:xxd_cmd = $XXDPROG
elseif executable('..\xxd\xxd.exe')
" we're on MS-Windows
let s:xxd_cmd = '..\xxd\xxd.exe'
elseif executable('../xxd/xxd')
" we're on something like Unix
let s:xxd_cmd = '../xxd/xxd'
else
" looks like xxd wasn't build (yet)
let s:xxd_cmd = ''
endif endif
func Common_head_only(text) func Common_head_only(text)

2
src/version.c
View File

@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
852,
/**/ /**/
851, 851,
/**/ /**/