diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-11-10 00:25:05 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-11-10 00:25:05 +0000 |
| commit | 90e66ec1e1f8eb13a833546f18e061a5709604da (patch) | |
| tree | 6834e4215b2d348e830241e69a7755d92ecd638b /src | |
| parent | 1d139a012e8b9880885c6f45796437cbee4820c7 (diff) | |
patch 9.0.0852: crypt test is skipped if xxd is not foundv9.0.0852
Problem: Crypt test is skipped if xxd is not found.
Solution: Find xxd where it was supposed to be build.
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_crypt.vim | 19 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 16 insertions, 5 deletions
diff --git a/src/testdir/test_crypt.vim b/src/testdir/test_crypt.vim index f3750b3da4..d1c645f4c9 100644 --- a/src/testdir/test_crypt.vim +++ b/src/testdir/test_crypt.vim @@ -3,11 +3,20 @@ 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) +" Use the xxd command from: +" 1: $XXDPROG if set and it is executable +" 2: the ../xxd directory if the executable is found there +if !empty($XXDPROG) && executable($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 func Common_head_only(text) @@ -118,7 +127,7 @@ endfunc func Test_uncrypt_xchacha20() 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..;./.', \ '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', diff --git a/src/version.c b/src/version.c index cb95d2c269..8056d66a5a 100644 --- 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 */ /**/ + 852, +/**/ 851, /**/ 850, |