From 31f19ce0a052f7c76d44a9a190e468c79cf5d56d Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 8 Jan 2017 14:14:43 +0100 Subject: [PATCH] patch 8.0.0154: system() test fails on OS/X Problem: system() test fails on OS/X. Solution: Deal with leading spaces. --- src/testdir/test_system.vim | 10 +++++++++- src/version.c | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_system.vim b/src/testdir/test_system.vim index be00d180c..0446bd910 100644 --- 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\df"], systemlist('cat', ["as\df"])) + new Xdummy call setline(1, ['asdf', "pw\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 diff --git a/src/version.c b/src/version.c index a1a74696a..368e6bea3 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 154, /**/ 153, /**/ -- 2.50.1