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

19
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)
@@ -118,7 +127,7 @@ endfunc
func Test_uncrypt_xchacha20() func Test_uncrypt_xchacha20()
CheckFeature sodium CheckFeature sodium
let hex=['00000000: 5669 6d43 7279 7074 7e30 3421 6b7d e607 vimCrypt~04!k}..', let hex = ['00000000: 5669 6d43 7279 7074 7e30 3421 6b7d e607 vimCrypt~04!k}..',
\ '00000010: 4ea4 e99f 923e f67f 7b59 a80d 3bca 2f06 N....>..{Y..;./.', \ '00000010: 4ea4 e99f 923e f67f 7b59 a80d 3bca 2f06 N....>..{Y..;./.',
\ '00000020: fa11 b951 8d09 0dc9 470f e7cf 8b90 4310 ...Q....G.....C.', \ '00000020: fa11 b951 8d09 0dc9 470f e7cf 8b90 4310 ...Q....G.....C.',
\ '00000030: 653b b83b e493 378b 0390 0e38 f912 626b e;.;..7....8..bk', \ '00000030: 653b b83b e493 378b 0390 0e38 f912 626b e;.;..7....8..bk',

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,
/**/ /**/