Patch 8.2.3256

3 views
Skip to first unread message

Bram Moolenaar

unread,
Jul 31, 2021, 11:20:45 AM7/31/21
to vim...@googlegroups.com

Patch 8.2.3256
Problem: Executable test may fail on new Ubuntu system.
Solution: Consider /usr/bin/cat and /bin/cat the same.
Files: src/testdir/test_functions.vim


*** ../vim-8.2.3255/src/testdir/test_functions.vim 2021-07-28 16:51:49.857364325 +0200
--- src/testdir/test_functions.vim 2021-07-31 15:23:13.472794141 +0200
***************
*** 1325,1330 ****
--- 1325,1333 ----
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
*** ../vim-8.2.3255/src/version.c 2021-07-31 13:31:37.331213775 +0200
--- src/version.c 2021-07-31 15:25:27.439981951 +0200
***************
*** 757,758 ****
--- 757,760 ----
{ /* Add new patch number below this line */
+ /**/
+ 3256,
/**/

--
When danger reared its ugly head,
He bravely turned his tail and fled
Yes, Brave Sir Robin turned about
And gallantly he chickened out
Bravely taking to his feet
He beat a very brave retreat
Bravest of the brave Sir Robin
Petrified of being dead
Soiled his pants then brave Sir Robin
Turned away and fled.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Reply all
Reply to author
Forward
0 new messages