diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-07-31 17:20:04 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-07-31 17:20:04 +0200 |
| commit | bf634a0a8b64fda2e53d3e2254fe0ffdc3d67196 (patch) | |
| tree | b2e55b622d3a1505f11bce4d18db8be5352e8736 | |
| parent | b9115da4bec5e6cfff69da85cc47c42dd67e42e4 (diff) | |
| download | vim-git-bf634a0a8b64fda2e53d3e2254fe0ffdc3d67196.tar.gz | |
patch 8.2.3256: executable test may fail on new Ubuntu systemv8.2.3256
Problem: Executable test may fail on new Ubuntu system.
Solution: Consider /usr/bin/cat and /bin/cat the same.
| -rw-r--r-- | src/testdir/test_functions.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim index de2db41f2..c0b425987 100644 --- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -1325,6 +1325,9 @@ func Test_Executable() if catcmd =~ '\<sbin\>' && result =~ '\<bin\>' call assert_equal('/' .. substitute(catcmd, '\<sbin\>', '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 index d8e07b156..2ef523779 100644 --- 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, |