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
index de2db41f249fd868b6dfcc19555b653ec5dea8f3..c0b4259871618f96e5963355707319313f59c28b 100644 (file)
--- 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 d8e07b156e71cb4ce0e7f9ee1b9264ff2ecd1102..2ef52377903e1ef59ba637f980ae23c794c87fe3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3256,
 /**/
     3255,
 /**/