diff options
| author | James McCoy <jamessan@jamessan.com> | 2021-10-11 16:27:03 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-10-11 16:27:03 +0100 |
| commit | a5d4f3b09d25006f7bc988d618152bd34177a579 (patch) | |
| tree | 8fa3cca47d44571b8bb8e5c1e1fe9a0db073e84c | |
| parent | b376aa2da4211fee7eaf16450bb8b37674e45bb0 (diff) | |
| download | vim-git-8.2.3496.tar.gz | |
patch 8.2.3496: crypt test fails if xxd was not installed yetv8.2.3496
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)
| -rw-r--r-- | src/testdir/test_crypt.vim | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/testdir/test_crypt.vim b/src/testdir/test_crypt.vim index 2e34c80a1..f43c22af0 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 @@ func Uncrypt_stable(method, crypted_text, key, uncrypted_text) 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 2ef2946b4..8a97806c6 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3496, +/**/ 3495, /**/ 3494, |