aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hahler <git@thequod.de>2018-07-11 10:07:55 +0200
committerDaniel Hahler <git@thequod.de>2018-09-08 16:43:27 +0200
commit53eb835e8f369c8a79eb4ac4239bb9e0b4bdc749 (patch)
tree5e6c7576909a370f9b9c593c50376e66dc3f94eb
parent2c64f01674d110063d79c77b0246abcc8a6f4ca3 (diff)
downloadrneovim-53eb835e8f369c8a79eb4ac4239bb9e0b4bdc749.tar.gz
rneovim-53eb835e8f369c8a79eb4ac4239bb9e0b4bdc749.tar.bz2
rneovim-53eb835e8f369c8a79eb4ac4239bb9e0b4bdc749.zip
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
-rw-r--r--src/nvim/testdir/test_escaped_glob.vim7
-rw-r--r--src/nvim/testdir/test_plus_arg_edit.vim2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/nvim/testdir/test_escaped_glob.vim b/src/nvim/testdir/test_escaped_glob.vim
index 9b34e77563..430317a23a 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 0907550bfa..71dbea1991 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