diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-07-04 14:20:41 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-07-04 14:20:41 +0200 |
commit | 0d702028feb859e6bde9a0c943d398d86294beb7 (patch) | |
tree | 0202bf4cc0ceb6ed162721e284582f499e7e1201 | |
parent | e4b407f536ba8bd007152649a347a95320d80fce (diff) | |
download | vim-git-0d702028feb859e6bde9a0c943d398d86294beb7.tar.gz |
patch 8.1.1624: when testing in the GUI may try to run gvim in a terminalv8.1.1624
Problem: When testing in the GUI may try to run gvim in a terminal.
Solution: Add the -v argument. (Yee Cheng Chin, closes #4605) Don't skip
tests that work now.
-rw-r--r-- | src/testdir/shared.vim | 7 | ||||
-rw-r--r-- | src/testdir/term_util.vim | 4 | ||||
-rw-r--r-- | src/testdir/test_mapping.vim | 4 | ||||
-rw-r--r-- | src/testdir/test_timers.vim | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
5 files changed, 14 insertions, 7 deletions
diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim index 53b731467..e1bb8184d 100644 --- 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. diff --git a/src/testdir/term_util.vim b/src/testdir/term_util.vim index 9bf38b39c..1cfac0e9d 100644 --- 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, diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim index 184e1a451..2c6aa2497 100644 --- 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))}) diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim index ee86e2a97..42fe4157d 100644 --- 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))}) diff --git a/src/version.c b/src/version.c index 8e2399f43..50c333c5b 100644 --- a/src/version.c +++ b/src/version.c @@ -778,6 +778,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1624, +/**/ 1623, /**/ 1622, |