diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-10-06 00:53:55 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-10-06 17:57:05 -0400 |
| commit | 7454b11ec115da973da36c36a76a5bf81967a5ff (patch) | |
| tree | 957e486c12d36f55c7958a08b79dd647b505b3df /src | |
| parent | dfd1c6c417847815fa6a7ed24b90f51e3000787a (diff) | |
| download | rneovim-7454b11ec115da973da36c36a76a5bf81967a5ff.tar.gz rneovim-7454b11ec115da973da36c36a76a5bf81967a5ff.tar.bz2 rneovim-7454b11ec115da973da36c36a76a5bf81967a5ff.zip | |
vim-patch:8.1.1624: when testing in the GUI may try to run gvim in a terminal
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.
https://github.com/vim/vim/commit/0d702028feb859e6bde9a0c943d398d86294beb7
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/shared.vim | 7 | ||||
| -rw-r--r-- | src/nvim/testdir/test_mapping.vim | 4 | ||||
| -rw-r--r-- | src/nvim/testdir/test_timers.vim | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/nvim/testdir/shared.vim b/src/nvim/testdir/shared.vim index 0d32f4d875..9bc037a59f 100644 --- a/src/nvim/testdir/shared.vim +++ b/src/nvim/testdir/shared.vim @@ -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. diff --git a/src/nvim/testdir/test_mapping.vim b/src/nvim/testdir/test_mapping.vim index 1a6b64e858..152afb4b9d 100644 --- a/src/nvim/testdir/test_mapping.vim +++ b/src/nvim/testdir/test_mapping.vim @@ -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))}) diff --git a/src/nvim/testdir/test_timers.vim b/src/nvim/testdir/test_timers.vim index ddf0ec61b2..13971a918d 100644 --- a/src/nvim/testdir/test_timers.vim +++ b/src/nvim/testdir/test_timers.vim @@ -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))}) |