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>

diff --git a/src/testdir/test_crash.vim b/src/testdir/test_crash.vim
index aa30684291c9cd567970ac98e83920a5b43a7ed7..b6ae4d215301e924d31e351d149a2a110e5059e6 100644 (file)
--- 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 437437ebc18301bec273a3da9bc3ac9a7631cc1f..3c12899bf6b18cdd64c3b53639dccbbb869d5aea 100644 (file)
--- 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 f2ffa40dba434120d4d9cebf3a468ed68a749b04..de89cd5009762cd78f618d99213e1b967ce5a123 100644 (file)
--- 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,
 /**/