thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.3553: xxd test fails on MS-Windows

Browse Source 
Problem:    Xxd test fails on MS-Windows.
Solution:   Split shell command in two.
This commit is contained in:
Bram Moolenaar
2021-10-22 15:11:37 +01:00
parent 47810464aa
commit 5a5c111e79
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/testdir/test_xxd.vim
View File

@@ -214,31 +214,38 @@ func Test_xxd()
endfunc endfunc
func Test_xxd_patch() func Test_xxd_patch()
let cmd = 'silent !' .. s:xxd_cmd .. ' -r Xxxdin Xxxdfile; ' .. s:xxd_cmd .. ' -g1 Xxxdfile > Xxxdout' 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(["2: 41 41", "8: 42 42"], 'Xxxdin')
call writefile(['::::::::'], 'Xxxdfile') call writefile(['::::::::'], 'Xxxdfile')
exe cmd exe cmd1
exe cmd2
call assert_equal(['00000000: 3a 3a 41 41 3a 3a 3a 3a 42 42 ::AA::::BB'], readfile('Xxxdout')) 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') call writefile(["2: 43 43 ", "8: 44 44"], 'Xxxdin')
exe cmd exe cmd1
exe cmd2
call assert_equal(['00000000: 3a 3a 43 43 3a 3a 3a 3a 44 44 ::CC::::DD'], readfile('Xxxdout')) 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') call writefile(["2: 45 45 ", "8: 46 46"], 'Xxxdin')
exe cmd exe cmd1
exe cmd2
call assert_equal(['00000000: 3a 3a 45 45 3a 3a 3a 3a 46 46 ::EE::::FF'], readfile('Xxxdout')) 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(["2: 41 41", "08: 42 42"], 'Xxxdin')
call writefile(['::::::::'], 'Xxxdfile') call writefile(['::::::::'], 'Xxxdfile')
exe cmd exe cmd1
exe cmd2
call assert_equal(['00000000: 3a 3a 41 41 3a 3a 3a 3a 42 42 ::AA::::BB'], readfile('Xxxdout')) 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') call writefile(["2: 43 43 ", "09: 44 44"], 'Xxxdin')
exe cmd exe cmd1
exe cmd2
call assert_equal(['00000000: 3a 3a 43 43 3a 3a 3a 3a 42 44 44 ::CC::::BDD'], readfile('Xxxdout')) 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') call writefile(["2: 45 45 ", "0a: 46 46"], 'Xxxdin')
exe cmd 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 assert_equal(['00000000: 3a 3a 45 45 3a 3a 3a 3a 42 44 46 46 ::EE::::BDFF'], readfile('Xxxdout'))
call delete('Xxxdin') call delete('Xxxdin')

2
src/version.c
View File

@@ -757,6 +757,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 */
/**/
3553,
/**/ /**/
3552, 3552,
/**/ /**/