diff options
| author | Philip H <47042125+pheiduck@users.noreply.github.com> | 2023-09-06 20:20:07 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-09-06 20:20:07 +0200 |
| commit | 1690ec64ffd784cddddb937870f5891adbb21986 (patch) | |
| tree | 41e07ccf4a7aae339334f5f5254c122eb654f4c7 | |
| parent | 18d2709aa12ffa3f6ae1a13059990558c5f8e406 (diff) | |
patch 9.0.1878: tests running sh have problemsv9.0.1878
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>
| -rw-r--r-- | src/testdir/test_crash.vim | 6 | ||||
| -rw-r--r-- | src/testdir/test_xxd.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/testdir/test_crash.vim b/src/testdir/test_crash.vim index aa30684291..b6ae4d2153 100644 --- 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!" diff --git a/src/testdir/test_xxd.vim b/src/testdir/test_xxd.vim index 437437ebc1..3c12899bf6 100644 --- 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) diff --git a/src/version.c b/src/version.c index f2ffa40dba..de89cd5009 100644 --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1878, +/**/ 1877, /**/ 1876, |