From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 1 Jan 2021 13:20:44 +0000 (+0100)
Subject: patch 8.2.2259: Test_Executable() fails when using chroot
X-Git-Tag: v8.2.2259
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a387083b2f65c2c14b19087c7d7f94ca23de1d48;p=thirdparty%2Fvim.git

patch 8.2.2259: Test_Executable() fails when using chroot

Problem:    Test_Executable() fails when using chroot.
Solution:   Ignore the difference between "sbin" and "bin".
---

diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 89db161802..b82f72fd02 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -1288,7 +1288,13 @@ func Test_Executable()
     " check that the relative path works in /
     lcd /
     call assert_equal(1, executable(catcmd))
-    call assert_equal('/' .. catcmd, catcmd->exepath())
+    let result = catcmd->exepath()
+    " when using chroot looking for sbin/cat can return bin/cat, that is OK
+    if catcmd =~ '\<sbin\>' && result =~ '\<bin\>'
+      call assert_equal('/' .. substitute(catcmd, '\<sbin\>', 'bin', ''), result)
+    else
+      call assert_equal('/' .. catcmd, result)
+    endif
     bwipe
   else
     throw 'Skipped: does not work on this platform'
diff --git a/src/version.c b/src/version.c
index 92d4573fe9..5ebda4692b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2259,
 /**/
     2258,
 /**/