Mercurial > vim
changeset 10528:3ea703795a4f v8.0.0154
commit https://github.com/vim/vim/commit/31f19ce0a052f7c76d44a9a190e468c79cf5d56d
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 8 14:14:43 2017 +0100
patch 8.0.0154: system() test fails on OS/X
Problem: system() test fails on OS/X.
Solution: Deal with leading spaces.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 08 Jan 2017 14:15:04 +0100 |
parents | d6990fcba559 |
children | 9a58ba599996 |
files | src/testdir/test_system.vim src/version.c |
diffstat | 2 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_system.vim +++ b/src/testdir/test_system.vim @@ -19,13 +19,21 @@ function! Test_System() call assert_equal('123', system('cat', '123')) call assert_equal(['123'], systemlist('cat', '123')) call assert_equal(["as\<NL>df"], systemlist('cat', ["as\<NL>df"])) + new Xdummy call setline(1, ['asdf', "pw\<NL>er", 'xxxx']) - call assert_equal("3\n", system('wc -l', bufnr('%'))) + let out = system('wc -l', bufnr('%')) + " On OS/X we get leading spaces + let out = substitute(out, '^ *', '', '') + call assert_equal("3\n", out) let out = systemlist('wc -l', bufnr('%')) " On Windows we may get a trailing CR. if out != ["3\r"] + " On OS/X we get leading spaces + if type(out) == v:t_list + let out[0] = substitute(out[0], '^ *', '', '') + endif call assert_equal(['3'], out) endif