# HG changeset patch # User Bram Moolenaar # Date 1627745404 -7200 # Node ID 01feec4a221dd5912b2f4f88c1e2f24b59aac100 # Parent dfbaaeabc580b49ba206fea864bededed3581753 patch 8.2.3256: executable test may fail on new Ubuntu system Commit: https://github.com/vim/vim/commit/bf634a0a8b64fda2e53d3e2254fe0ffdc3d67196 Author: Bram Moolenaar Date: Sat Jul 31 17:20:04 2021 +0200 patch 8.2.3256: executable test may fail on new Ubuntu system Problem: Executable test may fail on new Ubuntu system. Solution: Consider /usr/bin/cat and /bin/cat the same. diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim --- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -1325,6 +1325,9 @@ func Test_Executable() if catcmd =~ '\' && result =~ '\' call assert_equal('/' .. substitute(catcmd, '\', 'bin', ''), result) 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) endif bwipe diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3256, +/**/ 3255, /**/ 3254,