mirror of
https://github.com/vim/vim.git
synced 2025-07-04 23:07:33 -04:00
patch 8.1.1941: getftype() test fails on Mac
Problem: getftype() test fails on Mac. Solution: Skip /dev/fd/.
This commit is contained in:
parent
34ed68d40e
commit
ad5db44c01
@ -143,10 +143,13 @@ func Test_getftype()
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
for cdevfile in systemlist('find /dev -type c -maxdepth 2 2>/dev/null')
|
for cdevfile in systemlist('find /dev -type c -maxdepth 2 2>/dev/null')
|
||||||
let type = getftype(cdevfile)
|
" On Mac /def/fd/2 is found but the type is "fifo"
|
||||||
" ignore empty result, can happen if the file disappeared
|
if cdevfile !~ '/dev/fd/'
|
||||||
if type != ''
|
let type = getftype(cdevfile)
|
||||||
call assert_equal('cdev', type)
|
" ignore empty result, can happen if the file disappeared
|
||||||
|
if type != ''
|
||||||
|
call assert_equal('cdev', type, 'for ' .. cdevfile)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
endfor
|
endfor
|
||||||
|
|
||||||
@ -154,7 +157,7 @@ func Test_getftype()
|
|||||||
let type = getftype(bdevfile)
|
let type = getftype(bdevfile)
|
||||||
" ignore empty result, can happen if the file disappeared
|
" ignore empty result, can happen if the file disappeared
|
||||||
if type != ''
|
if type != ''
|
||||||
call assert_equal('bdev', type)
|
call assert_equal('bdev', type, 'for ' .. bdevfile)
|
||||||
endif
|
endif
|
||||||
endfor
|
endfor
|
||||||
|
|
||||||
@ -164,7 +167,7 @@ func Test_getftype()
|
|||||||
let type = getftype(socketfile)
|
let type = getftype(socketfile)
|
||||||
" ignore empty result, can happen if the file disappeared
|
" ignore empty result, can happen if the file disappeared
|
||||||
if type != ''
|
if type != ''
|
||||||
call assert_equal('socket', type)
|
call assert_equal('socket', type, 'for ' .. socketfile)
|
||||||
endif
|
endif
|
||||||
endfor
|
endfor
|
||||||
|
|
||||||
|
@ -761,6 +761,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1941,
|
||||||
/**/
|
/**/
|
||||||
1940,
|
1940,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user