To: vim_dev@googlegroups.com Subject: Patch 8.1.1941 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.1941 Problem: getftype() test fails on Mac. Solution: Skip /dev/fd/. Files: src/testdir/test_stat.vim *** ../vim-8.1.1940/src/testdir/test_stat.vim 2019-08-24 22:58:08.307264136 +0200 --- src/testdir/test_stat.vim 2019-08-30 13:11:25.251912123 +0200 *************** *** 143,152 **** 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) endif endfor --- 143,155 ---- endif for cdevfile in systemlist('find /dev -type c -maxdepth 2 2>/dev/null') ! " 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,160 **** let type = getftype(bdevfile) " ignore empty result, can happen if the file disappeared if type != '' ! call assert_equal('bdev', type) endif endfor --- 157,163 ---- let type = getftype(bdevfile) " ignore empty result, can happen if the file disappeared if type != '' ! call assert_equal('bdev', type, 'for ' .. bdevfile) endif endfor *************** *** 164,170 **** let type = getftype(socketfile) " ignore empty result, can happen if the file disappeared if type != '' ! call assert_equal('socket', type) endif endfor --- 167,173 ---- let type = getftype(socketfile) " ignore empty result, can happen if the file disappeared if type != '' ! call assert_equal('socket', type, 'for ' .. socketfile) endif endfor *** ../vim-8.1.1940/src/version.c 2019-08-29 22:48:20.921069540 +0200 --- src/version.c 2019-08-30 13:11:50.139770513 +0200 *************** *** 763,764 **** --- 763,766 ---- { /* Add new patch number below this line */ + /**/ + 1941, /**/ -- hundred-and-one symptoms of being an internet addict: 135. You cut classes or miss work so you can stay home and browse the web. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///