aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-08-01 11:15:21 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-08-01 11:27:11 -0400
commite98eba9086e703f5e010201ba05a73bcb713f751 (patch)
treed7c16c095657f9dd9a2bcc1c6d93e726e6e17bae /src
parent20fc0519af073374506b7a2cf4c452c1a9d62146 (diff)
downloadrneovim-e98eba9086e703f5e010201ba05a73bcb713f751.tar.gz
rneovim-e98eba9086e703f5e010201ba05a73bcb713f751.tar.bz2
rneovim-e98eba9086e703f5e010201ba05a73bcb713f751.zip
vim-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. https://github.com/vim/vim/commit/bf634a0a8b64fda2e53d3e2254fe0ffdc3d67196
Diffstat (limited to 'src')
-rw-r--r--src/nvim/testdir/test_functions.vim3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/nvim/testdir/test_functions.vim b/src/nvim/testdir/test_functions.vim
index bcf2edcc93..48f97be96b 100644
--- a/src/nvim/testdir/test_functions.vim
+++ b/src/nvim/testdir/test_functions.vim
@@ -1006,6 +1006,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