1
0
forked from aniani/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 #2354)
This commit is contained in:
Bram Moolenaar
2017-11-21 11:43:08 +01:00
parent 5df95ea9ef
commit 6e77df2d85
4 changed files with 12 additions and 1 deletions

View File

@@ -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 \

View File

@@ -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()

View File

@@ -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

View File

@@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1326,
/**/
1325,
/**/