aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-01 04:54:07 -04:00
Code Activity

patch 9.0.1878: tests running sh have problems

Browse Source 
Problem:  tests running sh have problems
Solution: Check that dash is installed

closes: #13040

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Philip H <47042125+pheiduck@users.noreply.github.com>
Co-authored-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Philip H
2023-09-06 20:20:07 +02:00
committed by Christian Brabandt
parent 18d2709aa1
commit 1690ec64ff
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/testdir/test_crash.vim
View File

@@ -6,10 +6,8 @@ CheckScreendump
func Test_crash1() func Test_crash1()
CheckNotBSD CheckNotBSD
CheckExecutable dash
if !executable('sh')
throw 'Skipped: sh not executable!'
endif
" The following used to crash Vim " The following used to crash Vim
let opts = #{cmd: 'sh'} let opts = #{cmd: 'sh'}
let vim = GetVimProg() let vim = GetVimProg()
@@ -64,7 +62,7 @@ func Test_crash1()
let args = printf(cmn_args, vim, file) let args = printf(cmn_args, vim, file)
call term_sendkeys(buf, args .. call term_sendkeys(buf, args ..
\ ' && echo "crash 7: [OK]" >> X_crash1_result.txt' .. "\<cr>") \ ' && echo "crash 7: [OK]" >> X_crash1_result.txt' .. "\<cr>")
call TermWait(buf, 1000) call TermWait(buf, 3000)
" clean up " clean up
exe buf .. "bw!" exe buf .. "bw!"

2
src/testdir/test_xxd.vim
View File

@@ -552,6 +552,7 @@ func Test_xxd_color2()
CheckUnix CheckUnix
CheckNotMac CheckNotMac
CheckNotBSD CheckNotBSD
CheckExecutable dash
"Note Quotation mark escaped "Note Quotation mark escaped
"Note Aposhpere vaihdettu apostrophe replaced with 0x00 "Note Aposhpere vaihdettu apostrophe replaced with 0x00
@@ -578,6 +579,7 @@ func Test_xxd_color2()
call system(s:xxd_cmd .. ' -r < Xinput > XXDfile_colors') call system(s:xxd_cmd .. ' -r < Xinput > XXDfile_colors')
let $PS1='$ ' 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: 'sh'})
call term_sendkeys(buf, s:xxd_cmd .. " -R never < XXDfile_colors\<cr>") call term_sendkeys(buf, s:xxd_cmd .. " -R never < XXDfile_colors\<cr>")
call TermWait(buf) call TermWait(buf)

2
src/version.c
View File

@@ -699,6 +699,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 */
/**/
1878,
/**/ /**/
1877, 1877,
/**/ /**/