Mercurial > vim

changeset 17889:0d64e74be8b2 v8.1.1941

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1941: getftype() test fails on Mac Commit: https://github.com/vim/vim/commit/ad5db44c0165b6254199e7af5962b42caf8b857c Author: Bram Moolenaar <Bram@vim.org> Date: Fri Aug 30 13:12:25 2019 +0200 patch 8.1.1941: getftype() test fails on Mac Problem: getftype() test fails on Mac. Solution: Skip /dev/fd/.
author Bram Moolenaar <Bram@vim.org>
date Fri, 30 Aug 2019 13:15:03 +0200
parents d4d44677c041
children 645284afff66
files src/testdir/test_stat.vim src/version.c
diffstat 2 files changed, 11 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_stat.vim
+++ b/src/testdir/test_stat.vim
@@ -143,10 +143,13 @@ func Test_getftype()
   endif
 
   for cdevfile in systemlist('find /dev -type c -maxdepth 2 2>/dev/null')
-    let type = getftype(cdevfile)
-    " ignore empty result, can happen if the file disappeared
-    if type != ''
-      call assert_equal('cdev', type)
+    " On Mac /def/fd/2 is found but the type is "fifo"
+    if cdevfile !~ '/dev/fd/'
+      let type = getftype(cdevfile)
+      " ignore empty result, can happen if the file disappeared
+      if type != ''
+	call assert_equal('cdev', type, 'for ' .. cdevfile)
+      endif
     endif
   endfor
 
@@ -154,7 +157,7 @@ func Test_getftype()
     let type = getftype(bdevfile)
     " ignore empty result, can happen if the file disappeared
     if type != ''
-      call assert_equal('bdev', type)
+      call assert_equal('bdev', type, 'for ' .. bdevfile)
     endif
   endfor
 
@@ -164,7 +167,7 @@ func Test_getftype()
     let type = getftype(socketfile)
     " ignore empty result, can happen if the file disappeared
     if type != ''
-      call assert_equal('socket', type)
+      call assert_equal('socket', type, 'for ' .. socketfile)
     endif
   endfor
 
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1941,
+/**/
     1940,
 /**/
     1939,