diff options
| -rw-r--r-- | src/testdir/test_functions.vim | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 1 deletions
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 @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2259, +/**/ 2258, /**/ 2257, |