IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.1624: when testing in the GUI may try to run gvim in a terminal

Browse Source 
Problem:    When testing in the GUI may try to run gvim in a terminal.
Solution:   Add the -v argument. (Yee Cheng Chin, closes vim/vim#4605)  Don't skip
            tests that work now.
0d702028fe
This commit is contained in:
Jan Edmund Lazo 2020-10-06 00:53:55 -04:00
parent dfd1c6c417
commit 7454b11ec1
No known key found for this signature in database
GPG Key ID: 64915E6E9F735B15
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/testdir/shared.vim
View File

@ -294,6 +294,13 @@ func GetVimCommandClean()
return cmd
endfunc
" Get the command to run Vim, with --clean, and force to run in terminal so it
" won't start a new GUI.
func GetVimCommandCleanTerm()
" Add -v to have gvim run in the terminal (if possible)
return GetVimCommandClean() .. ' -v '
endfunc
" Run Vim, using the "vimcmd" file and "-u NORC".
" "before" is a list of Vim commands to be executed before loading plugins.
" "after" is a list of Vim commands to be executed after loading plugins.

4
src/nvim/testdir/test_mapping.vim
View File

@ -392,7 +392,7 @@ func Test_motionforce_omap()
endfunc
func Test_error_in_map_expr()
if !has('terminal') || has('gui_running')
if !has('terminal') || (has('win32') && has('gui_running'))
throw 'Skipped: cannot run Vim in a terminal window'
endif
@ -406,7 +406,7 @@ func Test_error_in_map_expr()
[CODE]
call writefile(lines, 'Xtest.vim')
let buf = term_start(GetVimCommandClean() .. ' -S Xtest.vim', {'term_rows': 8})
let buf = term_start(GetVimCommandCleanTerm() .. ' -S Xtest.vim', {'term_rows': 8})
let job = term_getjob(buf)
call WaitForAssert({-> assert_notequal('', term_getline(buf, 8))})

4
src/nvim/testdir/test_timers.vim
View File

@ -341,7 +341,7 @@ func Test_nocatch_garbage_collect()
endfunc
func Test_error_in_timer_callback()
if !has('terminal') || has('gui_running')
if !has('terminal') || (has('win32') && has('gui_running'))
throw 'Skipped: cannot run Vim in a terminal window'
endif
@ -355,7 +355,7 @@ func Test_error_in_timer_callback()
[CODE]
call writefile(lines, 'Xtest.vim')
let buf = term_start(GetVimCommandClean() .. ' -S Xtest.vim', {'term_rows': 8})
let buf = term_start(GetVimCommandCleanTerm() .. ' -S Xtest.vim', {'term_rows': 8})
let job = term_getjob(buf)
call WaitForAssert({-> assert_notequal('', term_getline(buf, 8))})