Skip to content

Commit 6c501f7

Browse files
dezzachrisbra
authored andcommitted
patch 9.2.0613: tests: test_xxd_color2() checks for dash but uses sh
Problem: tests: test_xxd_color2() checks for dash but uses sh Solution: Use dash instead (Christoffer Aasted) Test is already checking for dash executable, but failing on distros not defaulting to /bin/sh as dash. Explicit dash will make it portable and deterministic. closes: #20473 Signed-off-by: Christoffer Aasted <[email protected]> Signed-off-by: Christian Brabandt <[email protected]>
1 parent 9d9bad2 commit 6c501f7

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

src/testdir/test_xxd.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ func Test_xxd_color2()
712712

713713
let $PS1='$ '
714714
" This needs dash, plain bashs sh does not seem to work :(
715-
let buf = RunVimInTerminal('', #{rows: 20, cmd: 'sh'})
715+
let buf = RunVimInTerminal('', #{rows: 20, cmd: 'dash'})
716716
call term_sendkeys(buf, s:xxd_cmd .. " -R never < XXDfile_colors\<cr>")
717717
call TermWait(buf)
718718
redraw

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,8 @@ static char *(features[]) =
754754

755755
static int included_patches[] =
756756
{ /* Add new patch number below this line */
757+
/**/
758+
613,
757759
/**/
758760
612,
759761
/**/

0 commit comments

Comments
 (0)