Mercurial > vim
changeset 25143:54a547489e49 v8.2.3108
patch 8.2.3108: test for remote_foreground() fails
Commit: https://github.com/vim/vim/commit/d6fa7bd5b900dd363d3a824e0ebe3619a1634df6
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jul 5 14:10:04 2021 +0200
patch 8.2.3108: test for remote_foreground() fails
Problem: Test for remote_foreground() fails. (Elimar Riesebieter)
Solution: Check that $DISPLAY is set. (Christian Brabandt)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 05 Jul 2021 14:15:05 +0200 |
parents | 31b4d41b8470 |
children | 3bcc707376fb |
files | src/testdir/check.vim src/testdir/test_clientserver.vim src/testdir/test_vim9_builtin.vim src/version.c |
diffstat | 4 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/check.vim +++ b/src/testdir/check.vim @@ -136,6 +136,14 @@ func CheckCanRunGui() endif endfunc +" Command to Check for an environment variable +command -nargs=1 CheckEnv call CheckEnv(<f-args>) +func CheckEnv(name) + if empty('$' .. a:name) + throw 'Skipped: Environment variable ' .. a:name .. ' is not set' + endif +endfunc + " Command to check that we are using the GUI command CheckGui call CheckGui() func CheckGui()
--- a/src/testdir/test_clientserver.vim +++ b/src/testdir/test_clientserver.vim @@ -13,9 +13,7 @@ source shared.vim func Check_X11_Connection() if has('x11') - if empty($DISPLAY) - throw 'Skipped: $DISPLAY is not set' - endif + CheckEnv DISPLAY try call remote_send('xxx', '') catch
--- a/src/testdir/test_vim9_builtin.vim +++ b/src/testdir/test_vim9_builtin.vim @@ -1415,6 +1415,8 @@ def Test_remote_foreground() CheckFeature clientserver # remote_foreground() doesn't fail on MS-Windows CheckNotMSWindows + CheckEnv DISPLAY + CheckDefFailure(['remote_foreground(10)'], 'E1013: Argument 1: type mismatch, expected string but got number') assert_fails('remote_foreground("NonExistingServer")', 'E241:') enddef