From ad5db44c0165b6254199e7af5962b42caf8b857c Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 30 Aug 2019 13:12:25 +0200 Subject: [PATCH] patch 8.1.1941: getftype() test fails on Mac Problem: getftype() test fails on Mac. Solution: Skip /dev/fd/. --- src/testdir/test_stat.vim | 15 +++++++++------ src/version.c | 2 ++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/testdir/test_stat.vim b/src/testdir/test_stat.vim index 8ec2a42c24..c8830d169b 100644 --- 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 diff --git a/src/version.c b/src/version.c index f0ccfe3b05..e6f7d141b4 100644 --- a/src/version.c +++ b/src/version.c @@ -761,6 +761,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1941, /**/ 1940, /**/