To: vim_dev@googlegroups.com
Subject: Patch 9.0.0852
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.0852
Problem:    Crypt test is skipped if xxd is not found.
Solution:   Find xxd where it was supposed to be build.
Files:      src/testdir/test_crypt.vim


*** ../vim-9.0.0851/src/testdir/test_crypt.vim	2022-03-22 21:08:06.000000000 +0000
--- src/testdir/test_crypt.vim	2022-11-10 00:23:02.616988863 +0000
***************
*** 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)
--- 3,22 ----
  source check.vim
  CheckFeature cryptv
  
! " 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,124 ****
  
  func Test_uncrypt_xchacha20()
    CheckFeature sodium
!   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',
--- 127,133 ----
  
  func Test_uncrypt_xchacha20()
    CheckFeature sodium
!   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',
*** ../vim-9.0.0851/src/version.c	2022-11-10 00:09:17.892798851 +0000
--- src/version.c	2022-11-10 00:23:58.185004708 +0000
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     852,
  /**/

-- 
Micro$oft: where do you want to go today?
    Linux: where do you want to go tomorrow?
  FreeBSD: are you guys coming, or what?

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///