Mercurial > vim
changeset 26038:542cc55a660b v8.2.3553
patch 8.2.3553: xxd test fails on MS-Windows
Commit: https://github.com/vim/vim/commit/5a5c111e79d1ea4b24133eaf44deab42a8e78eed
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Oct 22 15:11:37 2021 +0100
patch 8.2.3553: xxd test fails on MS-Windows
Problem: Xxd test fails on MS-Windows.
Solution: Split shell command in two.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Fri, 22 Oct 2021 16:15:05 +0200 |
parents | cd64a3fdf055 |
children | c96de830734b |
files | src/testdir/test_xxd.vim src/version.c |
diffstat | 2 files changed, 16 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_xxd.vim +++ b/src/testdir/test_xxd.vim @@ -214,31 +214,38 @@ func Test_xxd() endfunc 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(['::::::::'], '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 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 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 writefile(["2: 41 41", "08: 42 42"], 'Xxxdin') 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 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 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 delete('Xxxdin')