To: vim_dev@googlegroups.com Subject: Patch 8.2.2259 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2259 Problem: Test_Executable() fails when using chroot. Solution: Ignore the difference between "sbin" and "bin". Files: src/testdir/test_functions.vim *** ../vim-8.2.2258/src/testdir/test_functions.vim 2020-12-28 12:56:54.179617297 +0100 --- src/testdir/test_functions.vim 2020-12-31 14:33:15.009360805 +0100 *************** *** 1288,1294 **** " check that the relative path works in / lcd / call assert_equal(1, executable(catcmd)) ! call assert_equal('/' .. catcmd, catcmd->exepath()) bwipe else throw 'Skipped: does not work on this platform' --- 1288,1300 ---- " check that the relative path works in / lcd / call assert_equal(1, executable(catcmd)) ! let result = catcmd->exepath() ! " when using chroot looking for sbin/cat can return bin/cat, that is OK ! if catcmd =~ '\' && result =~ '\' ! call assert_equal('/' .. substitute(catcmd, '\', 'bin', ''), result) ! else ! call assert_equal('/' .. catcmd, result) ! endif bwipe else throw 'Skipped: does not work on this platform' *** ../vim-8.2.2258/src/version.c 2021-01-01 13:53:56.933340256 +0100 --- src/version.c 2021-01-01 14:19:46.114975656 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2259, /**/ -- hundred-and-one symptoms of being an internet addict: 73. You give your dog used motherboards instead of bones /// 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 ///