Mercurial > vim
changeset 33199:3395f1cbe3ab v9.0.1878
patch 9.0.1878: tests running sh have problems
Commit: https://github.com/vim/vim/commit/1690ec64ffd784cddddb937870f5891adbb21986
Author: Philip H <47042125+pheiduck@users.noreply.github.com>
Date: Wed Sep 6 20:20:07 2023 +0200
patch 9.0.1878: tests running sh have problems
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>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 06 Sep 2023 20:30:03 +0200 |
| parents | 2c730cb1c139 |
| children | 7fa2f374da16 |
| files | src/testdir/test_crash.vim src/testdir/test_xxd.vim src/version.c |
| diffstat | 3 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_crash.vim +++ b/src/testdir/test_crash.vim @@ -6,10 +6,8 @@ CheckScreendump func Test_crash1() CheckNotBSD + CheckExecutable dash - if !executable('sh') - throw 'Skipped: sh not executable!' - endif " The following used to crash Vim let opts = #{cmd: 'sh'} let vim = GetVimProg() @@ -64,7 +62,7 @@ func Test_crash1() let args = printf(cmn_args, vim, file) call term_sendkeys(buf, args .. \ ' && echo "crash 7: [OK]" >> X_crash1_result.txt' .. "\<cr>") - call TermWait(buf, 1000) + call TermWait(buf, 3000) " clean up exe buf .. "bw!"
--- a/src/testdir/test_xxd.vim +++ b/src/testdir/test_xxd.vim @@ -552,6 +552,7 @@ func Test_xxd_color2() CheckUnix CheckNotMac CheckNotBSD + CheckExecutable dash "Note Quotation mark escaped "Note Aposhpere vaihdettu apostrophe replaced with 0x00 @@ -578,6 +579,7 @@ func Test_xxd_color2() call system(s:xxd_cmd .. ' -r < Xinput > XXDfile_colors') let $PS1='$ ' + " This needs dash, plain bashs sh does not seem to work :( let buf = RunVimInTerminal('', #{rows: 20, cmd: 'sh'}) call term_sendkeys(buf, s:xxd_cmd .. " -R never < XXDfile_colors\<cr>") call TermWait(buf)