Mercurial > vim

changeset 25439:01feec4a221d v8.2.3256

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3256: executable test may fail on new Ubuntu system Commit: https://github.com/vim/vim/commit/bf634a0a8b64fda2e53d3e2254fe0ffdc3d67196 Author: Bram Moolenaar <Bram@vim.org> 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.
author Bram Moolenaar <Bram@vim.org>
date Sat, 31 Jul 2021 17:30:04 +0200
parents dfbaaeabc580
children b36a3efee848
files src/testdir/test_functions.vim src/version.c
diffstat 2 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,