Mercurial > vim
changeset 12899:9e04de2aa738 v8.0.1326
patch 8.0.1326: largefile test fails on CI, glob test on MS-Windows
commit https://github.com/vim/vim/commit/6e77df2d8555ade4470e566011603ae40f1f0f3a
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Nov 21 11:43:08 2017 +0100
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 #2354)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 21 Nov 2017 11:45:06 +0100 |
| parents | fdb63506ea50 |
| children | eae50e2223a0 |
| files | src/testdir/Make_all.mak src/testdir/test_escaped_glob.vim src/testdir/test_plus_arg_edit.vim src/version.c |
| diffstat | 4 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -67,6 +67,7 @@ SCRIPTS_GUI = # Tests using runtest.vim # Keep test_alot*.res as the last one, sort the others. +# test_largefile.res is omitted, it uses too much resources to run on CI. NEW_TESTS = test_arabic.res \ test_arglist.res \ test_assert.res \ @@ -122,7 +123,6 @@ NEW_TESTS = test_arabic.res \ test_job_fails.res \ test_json.res \ test_langmap.res \ - test_largefile.res \ test_let.res \ test_lineending.res \ test_listchars.res \
--- a/src/testdir/test_escaped_glob.vim +++ b/src/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()
--- a/src/testdir/test_plus_arg_edit.vim +++ b/src/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