Mercurial > vim
changeset 17249:3e2e998ce0db v8.1.1624
patch 8.1.1624: when testing in the GUI may try to run gvim in a terminal
commit https://github.com/vim/vim/commit/0d702028feb859e6bde9a0c943d398d86294beb7
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jul 4 14:20:41 2019 +0200
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 https://github.com/vim/vim/issues/4605) Don't skip
tests that work now.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 04 Jul 2019 14:30:05 +0200 |
parents | 6ad25d3ae8ce |
children | 62c322fcbd20 |
files | src/testdir/shared.vim src/testdir/term_util.vim src/testdir/test_mapping.vim src/testdir/test_timers.vim src/version.c |
diffstat | 5 files changed, 14 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/shared.vim +++ b/src/testdir/shared.vim @@ -284,6 +284,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.
--- a/src/testdir/term_util.vim +++ b/src/testdir/term_util.vim @@ -59,10 +59,8 @@ func RunVimInTerminal(arguments, options let cols = get(a:options, 'cols', 75) let statusoff = get(a:options, 'statusoff', 1) - let cmd = GetVimCommandClean() + let cmd = GetVimCommandCleanTerm() .. a:arguments - " Add -v to have gvim run in the terminal (if possible) - let cmd .= ' -v ' . a:arguments let buf = term_start(cmd, { \ 'curwin': 1, \ 'term_rows': rows,
--- a/src/testdir/test_mapping.vim +++ b/src/testdir/test_mapping.vim @@ -399,7 +399,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 @@ -413,7 +413,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))})
--- a/src/testdir/test_timers.vim +++ b/src/testdir/test_timers.vim @@ -334,7 +334,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 @@ -348,7 +348,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))})