]> granicus.if.org Git - vim/commitdiff
patch 8.2.0211: test for ANSI colors fails without an "ls" command v8.2.0211
authorBram Moolenaar <Bram@vim.org>
Wed, 5 Feb 2020 19:10:33 +0000 (20:10 +0100)
committerBram Moolenaar <Bram@vim.org>
Wed, 5 Feb 2020 19:10:33 +0000 (20:10 +0100)
Problem:    Test for ANSI colors fails without an "ls" command.
Solution:   Use "dir". (Ken Takata, closes #5582)

src/testdir/test_functions.vim
src/version.c

index 4f417fa932e07920322ba8728fea7f0f96b92516..9173e8547c9600ed452b5820b9ea76e466918cc1 100644 (file)
@@ -1965,7 +1965,7 @@ func Test_range()
 
   " settagstack()
   call settagstack(1, #{items : range(4)})
-  
+
   " sign_define()
   call assert_fails("call sign_define(range(5))", "E715:")
   call assert_fails("call sign_placelist(range(5))", "E715:")
@@ -1997,12 +1997,17 @@ func Test_range()
   set tagfunc=TagFunc
   call assert_fails("call taglist('asdf')", 'E987:')
   set tagfunc=
-  
+
   " term_start()
   if has('terminal') && has('termguicolors')
     call assert_fails('call term_start(range(3, 4))', 'E474:')
     let g:terminal_ansi_colors = range(16)
-    call assert_fails('call term_start("ls", #{term_finish: "close"})', 'E475:')
+    if has('win32')
+      let cmd = "cmd /c dir"
+    else
+      let cmd = "ls"
+    endif
+    call assert_fails('call term_start("' .. cmd .. '", #{term_finish: "close"})', 'E475:')
     unlet g:terminal_ansi_colors
   endif
 
index 53262817de3eb05829e489acb6beabd7dcee1db1..a482b034a603e25235d0a30e2a1bb7630b2d725e 100644 (file)
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    211,
 /**/
     210,
 /**/