Patch 8.2.3553

[Bram Moolenaar]

Patch 8.2.3553 (after 8.2.3552)
Problem: Xxd test fails on MS-Windows.
Solution: Split shell command in two.
Files: src/testdir/test_xxd.vim


*** ../vim-8.2.3552/src/testdir/test_xxd.vim 2021-10-22 12:55:38.753954514 +0100
--- src/testdir/test_xxd.vim 2021-10-22 15:09:16.636834453 +0100
***************
*** 214,244 ****
endfunc

func Test_xxd_patch()
! let cmd = 'silent !' .. s:xxd_cmd .. ' -r Xxxdin Xxxdfile; ' .. s:xxd_cmd .. ' -g1 Xxxdfile > Xxxdout'
call writefile(["2: 41 41", "8: 42 42"], 'Xxxdin')
call writefile(['::::::::'], 'Xxxdfile')
! exe cmd
call assert_equal(['00000000: 3a 3a 41 41 3a 3a 3a 3a 42 42 ::AA::::BB'], readfile('Xxxdout'))

call writefile(["2: 43 43 ", "8: 44 44"], 'Xxxdin')
! exe cmd
call assert_equal(['00000000: 3a 3a 43 43 3a 3a 3a 3a 44 44 ::CC::::DD'], readfile('Xxxdout'))

call writefile(["2: 45 45 ", "8: 46 46"], 'Xxxdin')
! exe cmd
call assert_equal(['00000000: 3a 3a 45 45 3a 3a 3a 3a 46 46 ::EE::::FF'], readfile('Xxxdout'))

call writefile(["2: 41 41", "08: 42 42"], 'Xxxdin')
call writefile(['::::::::'], 'Xxxdfile')
! exe cmd
call assert_equal(['00000000: 3a 3a 41 41 3a 3a 3a 3a 42 42 ::AA::::BB'], readfile('Xxxdout'))

call writefile(["2: 43 43 ", "09: 44 44"], 'Xxxdin')
! exe cmd
call assert_equal(['00000000: 3a 3a 43 43 3a 3a 3a 3a 42 44 44 ::CC::::BDD'], readfile('Xxxdout'))

call writefile(["2: 45 45 ", "0a: 46 46"], 'Xxxdin')
! exe cmd
call assert_equal(['00000000: 3a 3a 45 45 3a 3a 3a 3a 42 44 46 46 ::EE::::BDFF'], readfile('Xxxdout'))

call delete('Xxxdin')
--- 214,251 ----
endfunc

func Test_xxd_patch()
! let cmd1 = 'silent !' .. s:xxd_cmd .. ' -r Xxxdin Xxxdfile'
! let cmd2 = 'silent !' .. s:xxd_cmd .. ' -g1 Xxxdfile > Xxxdout'
call writefile(["2: 41 41", "8: 42 42"], 'Xxxdin')
call writefile(['::::::::'], 'Xxxdfile')
! exe cmd1
! exe cmd2
call assert_equal(['00000000: 3a 3a 41 41 3a 3a 3a 3a 42 42 ::AA::::BB'], readfile('Xxxdout'))

call writefile(["2: 43 43 ", "8: 44 44"], 'Xxxdin')
! exe cmd1
! exe cmd2
call assert_equal(['00000000: 3a 3a 43 43 3a 3a 3a 3a 44 44 ::CC::::DD'], readfile('Xxxdout'))

call writefile(["2: 45 45 ", "8: 46 46"], 'Xxxdin')
! exe cmd1
! exe cmd2
call assert_equal(['00000000: 3a 3a 45 45 3a 3a 3a 3a 46 46 ::EE::::FF'], readfile('Xxxdout'))

call writefile(["2: 41 41", "08: 42 42"], 'Xxxdin')
call writefile(['::::::::'], 'Xxxdfile')
! exe cmd1
! exe cmd2
call assert_equal(['00000000: 3a 3a 41 41 3a 3a 3a 3a 42 42 ::AA::::BB'], readfile('Xxxdout'))

call writefile(["2: 43 43 ", "09: 44 44"], 'Xxxdin')
! exe cmd1
! exe cmd2
call assert_equal(['00000000: 3a 3a 43 43 3a 3a 3a 3a 42 44 44 ::CC::::BDD'], readfile('Xxxdout'))

call writefile(["2: 45 45 ", "0a: 46 46"], 'Xxxdin')
! exe cmd1
! exe cmd2
call assert_equal(['00000000: 3a 3a 45 45 3a 3a 3a 3a 42 44 46 46 ::EE::::BDFF'], readfile('Xxxdout'))

call delete('Xxxdin')
*** ../vim-8.2.3552/src/version.c 2021-10-22 12:55:38.753954514 +0100
--- src/version.c 2021-10-22 15:10:06.745480535 +0100
***************
*** 759,760 ****
--- 759,762 ----
{ /* Add new patch number below this line */
+ /**/
+ 3553,
/**/

--
hundred-and-one symptoms of being an internet addict:
219. Your spouse has his or her lawyer deliver the divorce papers...
via e-mail.

/// Bram Moolenaar -- Br...@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 ///