patch 9.0.1878: tests running sh have problems
Commit:
https://github.com/vim/vim/commit/1690ec64ffd784cddddb937870f5891adbb21986
Author: Philip H <[email protected]>
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 <[email protected]>
Co-authored-by: Philip H <[email protected]>
Co-authored-by: Christian Brabandt <[email protected]>
diff --git a/src/testdir/test_crash.vim b/src/testdir/test_crash.vim
index aa3068429..b6ae4d215 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 437437ebc..3c12899bf 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 f2ffa40db..de89cd500 100644
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1878,
/**/
1877,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1qdxHv-000h8R-Qc%40256bit.org.
