mirror of https://github.com/vim/vim.git
patch 8.1.2358: tests fail on Cirrus CI for FreeBSD
Problem: Tests fail on Cirrus CI for FreeBSD. Solution: Fix a test and skip some. (Christian Brabandt, closes #5281)
This commit is contained in:
parent
68e9e5f7fc
commit
9134f1ecd4
|
@ -1,5 +1,5 @@
|
|||
env:
|
||||
#CIRRUS_CLONE_DEPTH: 1
|
||||
CIRRUS_CLONE_DEPTH: 3
|
||||
FEATURES: huge
|
||||
|
||||
freebsd_12_task:
|
||||
|
@ -13,4 +13,5 @@ freebsd_12_task:
|
|||
- make -j${NPROC}
|
||||
- src/vim --version
|
||||
test_script:
|
||||
- make test
|
||||
# Runtime Indent tests do not work, run only the normal test suite
|
||||
- cd src && make test
|
||||
|
|
1
Filelist
1
Filelist
|
@ -8,6 +8,7 @@ SRC_ALL = \
|
|||
.hgignore \
|
||||
.lgtm.yml \
|
||||
.travis.yml \
|
||||
.cirrus.yml \
|
||||
appveyor.yml \
|
||||
ci/appveyor.bat \
|
||||
src/Make_all.mak \
|
||||
|
|
|
@ -64,6 +64,15 @@ func CheckUnix()
|
|||
endif
|
||||
endfunc
|
||||
|
||||
" Command to check for not running on a BSD system.
|
||||
" TODO: using this checks should not be needed
|
||||
command CheckNotBSD call CheckNotBSD()
|
||||
func CheckNotBSD()
|
||||
if has('bsd')
|
||||
throw 'Skipped: does not work on BSD'
|
||||
endif
|
||||
endfunc
|
||||
|
||||
" Command to check that making screendumps is supported.
|
||||
" Caller must source screendump.vim
|
||||
command CheckScreendump call CheckScreendump()
|
||||
|
|
|
@ -1204,7 +1204,8 @@ func Test_normal23_K()
|
|||
return
|
||||
endif
|
||||
|
||||
if has('mac') || has('bsd')
|
||||
let not_gnu_man = has('mac') || has('bsd')
|
||||
if not_gnu_man
|
||||
" In MacOS and BSD, the option for specifying a pager is different
|
||||
set keywordprg=man\ -P\ cat
|
||||
else
|
||||
|
@ -1213,7 +1214,7 @@ func Test_normal23_K()
|
|||
" Test for using man
|
||||
2
|
||||
let a = execute('unsilent norm! K')
|
||||
if has('mac')
|
||||
if not_gnu_man
|
||||
call assert_match("man -P cat 'man'", a)
|
||||
else
|
||||
call assert_match("man --pager=cat 'man'", a)
|
||||
|
|
|
@ -1685,6 +1685,7 @@ func s:create_test_file(filename)
|
|||
endfunc
|
||||
|
||||
func Test_switchbuf()
|
||||
CheckNotBSD
|
||||
call s:create_test_file('Xqftestfile1')
|
||||
call s:create_test_file('Xqftestfile2')
|
||||
call s:create_test_file('Xqftestfile3')
|
||||
|
|
|
@ -1,7 +1,10 @@
|
|||
" Test the :source! command
|
||||
source check.vim
|
||||
|
||||
func Test_source_utf8()
|
||||
" check that sourcing a script with 0x80 as second byte works
|
||||
" does not work correctly on BSD
|
||||
CheckNotBSD
|
||||
new
|
||||
call setline(1, [':%s/àx/--à1234--/g', ':%s/Àx/--À1234--/g'])
|
||||
write! Xscript
|
||||
|
@ -31,6 +34,7 @@ endfunc
|
|||
|
||||
" Test for sourcing a file with CTRL-V's at the end of the line
|
||||
func Test_source_ctrl_v()
|
||||
CheckNotBSD
|
||||
call writefile(['map __1 afirst',
|
||||
\ 'map __2 asecond',
|
||||
\ 'map __3 athird',
|
||||
|
|
|
@ -870,6 +870,7 @@ func Test_terminal_wqall()
|
|||
endfunc
|
||||
|
||||
func Test_terminal_composing_unicode()
|
||||
CheckNotBSD
|
||||
let save_enc = &encoding
|
||||
set encoding=utf-8
|
||||
|
||||
|
|
|
@ -86,6 +86,9 @@ endfunc
|
|||
" test that g~ap changes one paragraph only.
|
||||
func Test_gap()
|
||||
new
|
||||
call feedkeys("iabcd\n\ndefggg0g~ap", "tx")
|
||||
" setup text
|
||||
call feedkeys("iabcd\<cr>\<cr>defg", "tx")
|
||||
" modify only first line
|
||||
call feedkeys("gg0g~ap", "tx")
|
||||
call assert_equal(["ABCD", "", "defg"], getline(1,3))
|
||||
endfunc
|
||||
|
|
|
@ -737,6 +737,8 @@ static char *(features[]) =
|
|||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
2358,
|
||||
/**/
|
||||
2357,
|
||||
/**/
|
||||
|
|
Loading…
Reference in New Issue