commit ad5db44c0165b6254199e7af5962b42caf8b857c
author Bram Moolenaar <Bram@vim.org> Fri Aug 30 13:12:25 2019 +0200
committer Bram Moolenaar <Bram@vim.org> Fri Aug 30 13:12:25 2019 +0200
tree c776d419bad8882d6369513d707a009e2c041c8a
parent 34ed68d40eb9c71f34a44b94263f5e7e6856cba0

patch 8.1.1941: getftype() test fails on Mac

Problem:    getftype() test fails on Mac.
Solution:   Skip /dev/fd/.

src/testdir/test_stat.vim

diff --git a/src/testdir/test_stat.vim b/src/testdir/test_stat.vim
index 8ec2a42..c8830d1 100644
--- a/src/testdir/test_stat.vim
+++ b/src/testdir/test_stat.vim
@@ -143,10 +143,13 @@
   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 @@
     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 @@
     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
 

src/version.c

diff --git a/src/version.c b/src/version.c
index f0ccfe3..e6f7d14 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1941,
+/**/
     1940,
 /**/
     1939,