From 4b10f7357f051b332e95c6e8afcb696cc15f0ff0 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Wed, 11 Jul 2018 10:07:55 +0200 Subject: [PATCH] vim-patch:8.0.1326: largefile test fails on CI, glob test on MS-Windows Problem: Largefile test fails on CI, glob test on MS-Windows. Solution: Remove largefile test from list of all tests. Don't run Test_glob() on non-unix systems. More cleanup. (Yegappan Lakshmanan, closes vim/vim#2354) https://github.com/vim/vim/commit/6e77df2d8555ade4470e566011603ae40f1f0f3a --- src/nvim/testdir/test_escaped_glob.vim | 7 +++++++ src/nvim/testdir/test_plus_arg_edit.vim | 2 ++ 2 files changed, 9 insertions(+) diff --git a/src/nvim/testdir/test_escaped_glob.vim b/src/nvim/testdir/test_escaped_glob.vim index 9b34e775637969..430317a23abcd5 100644 --- a/src/nvim/testdir/test_escaped_glob.vim +++ b/src/nvim/testdir/test_escaped_glob.vim @@ -9,12 +9,19 @@ function SetUp() endfunction function Test_glob() + if !has('unix') + " This test fails on Windows because of the special characters in the + " filenames. Disable the test on non-Unix systems for now. + return + endif call assert_equal("", glob('Xxx\{')) call assert_equal("", glob('Xxx\$')) w! Xxx{ w! Xxx\$ call assert_equal("Xxx{", glob('Xxx\{')) call assert_equal("Xxx$", glob('Xxx\$')) + call delete('Xxx{') + call delete('Xxx$') endfunction function Test_globpath() diff --git a/src/nvim/testdir/test_plus_arg_edit.vim b/src/nvim/testdir/test_plus_arg_edit.vim index 0907550bfa6a9a..71dbea199174a3 100644 --- a/src/nvim/testdir/test_plus_arg_edit.vim +++ b/src/nvim/testdir/test_plus_arg_edit.vim @@ -5,4 +5,6 @@ function Test_edit() edit +1|s/|/PIPE/|w Xfile1| e Xfile2|1 | s/\//SLASH/|w call assert_equal(["fooPIPEbar"], readfile("Xfile1")) call assert_equal(["fooSLASHbar"], readfile("Xfile2")) + call delete('Xfile1') + call delete('Xfile2') endfunction