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 de2db41..c0b4259 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -1325,6 +1325,9 @@
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 d8e07b1..2ef5237 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3256,
+/**/
3255,
/**/
3254,