aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.3256: executable test may fail on new Ubuntu system

Browse Source 
Problem:    Executable test may fail on new Ubuntu system.
Solution:   Consider /usr/bin/cat and /bin/cat the same.
This commit is contained in:
Bram Moolenaar 2021-07-31 17:20:04 +02:00
parent b9115da4be
commit bf634a0a8b
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/testdir/test_functions.vim
View File

@ -1325,6 +1325,9 @@ func Test_Executable()
if catcmd =~ '\<sbin\>' && result =~ '\<bin\>' if catcmd =~ '\<sbin\>' && result =~ '\<bin\>'
call assert_equal('/' .. substitute(catcmd, '\<sbin\>', 'bin', ''), result) call assert_equal('/' .. substitute(catcmd, '\<sbin\>', 'bin', ''), result)
else else
" /bin/cat and /usr/bin/cat may be hard linked, we could get either
let result = substitute(result, '/usr/bin/cat', '/bin/cat', '')
let catcmd = substitute(catcmd, 'usr/bin/cat', 'bin/cat', '')
call assert_equal('/' .. catcmd, result) call assert_equal('/' .. catcmd, result)
endif endif
bwipe bwipe

2
src/version.c
View File

@ -755,6 +755,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 */
/**/
3256,
/**/ /**/
3255, 3255,
/**/ /**/