Commit: patch 9.2.0613: tests: test_xxd_color2() checks for dash but uses sh

1 view
Skip to first unread message

Christian Brabandt

unread,
3:45 PM (4 hours ago) 3:45 PM
to vim...@googlegroups.com
patch 9.2.0613: tests: test_xxd_color2() checks for dash but uses sh

Commit: https://github.com/vim/vim/commit/6c501f71eab5031043547ffdfa6b469250006933
Author: Christoffer Aasted <dez...@gmail.com>
Date: Wed Jun 10 19:39:24 2026 +0000

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 <dez...@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/testdir/test_xxd.vim b/src/testdir/test_xxd.vim
index 990683b17..fd23d38e1 100644
--- a/src/testdir/test_xxd.vim
+++ b/src/testdir/test_xxd.vim
@@ -712,7 +712,7 @@ func Test_xxd_color2()

let $PS1='$ '
" This needs dash, plain bashs sh does not seem to work :(
- let buf = RunVimInTerminal('', #{rows: 20, cmd: 'sh'})
+ let buf = RunVimInTerminal('', #{rows: 20, cmd: 'dash'})
call term_sendkeys(buf, s:xxd_cmd .. " -R never < XXDfile_colors\<cr>")
call TermWait(buf)
redraw
diff --git a/src/version.c b/src/version.c
index 7fa36a0f5..f32381821 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 613,
/**/
612,
/**/
Reply all
Reply to author
Forward
0 new messages