aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/testdir/test_system.vim
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2018-04-15 02:37:22 +0200
committerGitHub <noreply@github.com>2018-04-15 02:37:22 +0200
commita7e7f7bd83abc5c31008e40556f794d9b00db431 (patch)
tree1e0fdc80c9dd08aff01735a30aed9c2d79792f7d /src/nvim/testdir/test_system.vim
parentee4e1fd8ecf1747b55d2968084047552429cedee (diff)
parent51b9d85bb47495014968922d4adff5319ba44900 (diff)
downloadrneovim-a7e7f7bd83abc5c31008e40556f794d9b00db431.tar.gz
rneovim-a7e7f7bd83abc5c31008e40556f794d9b00db431.tar.bz2
rneovim-a7e7f7bd83abc5c31008e40556f794d9b00db431.zip
Merge #8160 'win: oldtests: prefer cmd.exe'
Diffstat (limited to 'src/nvim/testdir/test_system.vim')
-rw-r--r--src/nvim/testdir/test_system.vim10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/nvim/testdir/test_system.vim b/src/nvim/testdir/test_system.vim
index ce9d110d82..d3c0594c03 100644
--- a/src/nvim/testdir/test_system.vim
+++ b/src/nvim/testdir/test_system.vim
@@ -5,14 +5,12 @@ function! Test_System()
return
endif
let out = system('echo 123')
- " On Windows we may get a trailing space.
- if out != "123 \n"
- call assert_equal("123\n", out)
- endif
+ call assert_equal("123\n", out)
let out = systemlist('echo 123')
- " On Windows we may get a trailing space and CR.
- if out != ["123 \r"]
+ if &shell =~# 'cmd.exe$'
+ call assert_equal(["123\r"], out)
+ else
call assert_equal(['123'], out)
endif