mirror of
https://github.com/neovim/neovim.git
synced 2024-09-17 20:58:20 -04:00
Introduce nvim namespace: Fix functional tests.
Fix some paths to new locations: - Makefile: Fix nvim binary path. - test49 : 459: Fix nvim binary path. - test89 : 62: Fix testdir root. Fix corresponding expected result. - test105 : 10: Testing fnamemodify to reduce path to use ~ prefix. Fix faked home directory. Fix corresponding expected result. 26: Testing fnamemodify with r modifier. Fix out-of-project prefix removal. Fix corresponding expected result.
This commit is contained in:
parent
74b9396043
commit
2ababe5a99
26
.gitignore
vendored
26
.gitignore
vendored
@ -17,19 +17,19 @@
|
||||
/src/po/*.ck
|
||||
|
||||
# Files generated by the tests
|
||||
/src/testdir/mbyte.vim
|
||||
/src/testdir/mzscheme.vim
|
||||
/src/testdir/lua.vim
|
||||
/src/testdir/small.vim
|
||||
/src/testdir/tiny.vim
|
||||
/src/testdir/test*.out
|
||||
/src/testdir/test.log
|
||||
/src/testdir/viminfo
|
||||
/src/testdir/test.ok
|
||||
/src/testdir/*.failed
|
||||
/src/testdir/X*
|
||||
/src/testdir/valgrind.*
|
||||
/src/testdir/.gdbinit
|
||||
/src/nvim/testdir/mbyte.vim
|
||||
/src/nvim/testdir/mzscheme.vim
|
||||
/src/nvim/testdir/lua.vim
|
||||
/src/nvim/testdir/small.vim
|
||||
/src/nvim/testdir/tiny.vim
|
||||
/src/nvim/testdir/test*.out
|
||||
/src/nvim/testdir/test.log
|
||||
/src/nvim/testdir/viminfo
|
||||
/src/nvim/testdir/test.ok
|
||||
/src/nvim/testdir/*.failed
|
||||
/src/nvim/testdir/X*
|
||||
/src/nvim/testdir/valgrind.*
|
||||
/src/nvim/testdir/.gdbinit
|
||||
|
||||
# Folder generated by the unit tests
|
||||
/test/includes/post/
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
export SHELL := sh
|
||||
|
||||
VIMPROG := ../../build/bin/nvim
|
||||
VIMPROG := ../../../build/bin/nvim
|
||||
|
||||
SCRIPTS := test_eval.out \
|
||||
test1.out test2.out test3.out test4.out test5.out \
|
||||
|
@ -7,7 +7,7 @@ STARTTEST
|
||||
:set shellslash
|
||||
:let tab="\t"
|
||||
:command -nargs=1 Put :let expr=<q-args> | $put =expr.tab.strtrans(string(eval(expr)))
|
||||
:let $HOME=fnamemodify('.', ':p:h:h:h')
|
||||
:let $HOME=fnamemodify('.', ':p:h:h:h:h')
|
||||
:Put fnamemodify('.', ':p' )[-1:]
|
||||
:Put fnamemodify('.', ':p:h' )[-1:]
|
||||
:Put fnamemodify('test.out', ':p' )[-1:]
|
||||
@ -23,7 +23,7 @@ STARTTEST
|
||||
:Put fnamemodify('abc.fb2.tar.gz', ':r' )
|
||||
:Put fnamemodify('abc.fb2.tar.gz', ':r:r' )
|
||||
:Put fnamemodify('abc.fb2.tar.gz', ':r:r:r' )
|
||||
:Put substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(src/testdir/.*\)', '\1', '')
|
||||
:Put substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(src/nvim/testdir/.*\)', '\1', '')
|
||||
:Put fnamemodify('abc.fb2.tar.gz', ':e' )
|
||||
:Put fnamemodify('abc.fb2.tar.gz', ':e:e' )
|
||||
:Put fnamemodify('abc.fb2.tar.gz', ':e:e:e' )
|
||||
|
@ -3,8 +3,8 @@ fnamemodify('.', ':p:h' )[-1:] 'r'
|
||||
fnamemodify('test.out', ':p' )[-1:] 't'
|
||||
fnamemodify('test.out', ':.' ) 'test.out'
|
||||
fnamemodify('../testdir/a', ':.' ) 'a'
|
||||
fnamemodify('test.out', ':~' ) '~/src/testdir/test.out'
|
||||
fnamemodify('../testdir/a', ':~' ) '~/src/testdir/a'
|
||||
fnamemodify('test.out', ':~' ) '~/src/nvim/testdir/test.out'
|
||||
fnamemodify('../testdir/a', ':~' ) '~/src/nvim/testdir/a'
|
||||
fnamemodify('../testdir/a', ':t' ) 'a'
|
||||
fnamemodify('.', ':p:t' ) ''
|
||||
fnamemodify('test.out', ':p:t' ) 'test.out'
|
||||
@ -13,7 +13,7 @@ fnamemodify('test.out', ':p:t:e' ) 'out'
|
||||
fnamemodify('abc.fb2.tar.gz', ':r' ) 'abc.fb2.tar'
|
||||
fnamemodify('abc.fb2.tar.gz', ':r:r' ) 'abc.fb2'
|
||||
fnamemodify('abc.fb2.tar.gz', ':r:r:r' ) 'abc'
|
||||
substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(src/testdir/.*\)', '\1', '') 'src/testdir/abc.fb2'
|
||||
substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(src/nvim/testdir/.*\)', '\1', '') 'src/nvim/testdir/abc.fb2'
|
||||
fnamemodify('abc.fb2.tar.gz', ':e' ) 'gz'
|
||||
fnamemodify('abc.fb2.tar.gz', ':e:e' ) 'tar.gz'
|
||||
fnamemodify('abc.fb2.tar.gz', ':e:e:e' ) 'fb2.tar.gz'
|
||||
|
@ -17,11 +17,11 @@
|
||||
"
|
||||
" :let test49_set_env = 1 | source test49.vim
|
||||
"
|
||||
" To get them always (from src/testdir), put a line
|
||||
" To get them always (from src/nvim/testdir), put a line
|
||||
"
|
||||
" au! BufRead test49.vim let test49_set_env = 1 | source test49.vim
|
||||
"
|
||||
" into the local .vimrc file in the src/testdir directory.
|
||||
" into the local .vimrc file in the src/nvim/testdir directory.
|
||||
"
|
||||
if exists("test49_set_env") && test49_set_env
|
||||
|
||||
@ -456,7 +456,7 @@ function! ExtraVim(...)
|
||||
" messing up the user's viminfo file.
|
||||
let redirect = a:0 ?
|
||||
\ " -c 'au VimLeave * redir END' -c 'redir\\! >" . a:1 . "'" : ""
|
||||
exec "!echo '" . debug_quits . "q' | ../../build/bin/nvim -u NONE -N -Xes" . redirect .
|
||||
exec "!echo '" . debug_quits . "q' | ../../../build/bin/nvim -u NONE -N -Xes" . redirect .
|
||||
\ " -c 'debuggreedy|set viminfo+=nviminfo'" .
|
||||
\ " -c 'let ExtraVimBegin = " . extra_begin . "'" .
|
||||
\ " -c 'let ExtraVimResult = \"" . resultfile . "\"'" . breakpoints .
|
||||
|
@ -59,7 +59,7 @@ STARTTEST
|
||||
:$put ='Testing findfile'
|
||||
:$put =''
|
||||
:set ssl
|
||||
:$put =findfile('test19.in','src/test*')
|
||||
:$put =findfile('test19.in','src/nvim/test*')
|
||||
:exe "cd" cwd
|
||||
:cd ..
|
||||
:$put =findfile('test19.in','test*')
|
||||
|
@ -23,6 +23,6 @@ results:
|
||||
|
||||
Testing findfile
|
||||
|
||||
src/testdir/test19.in
|
||||
src/nvim/testdir/test19.in
|
||||
testdir/test19.in
|
||||
testdir/test19.in
|
||||
|
Loading…
Reference in New Issue
Block a user