From d6fa7bd5b900dd363d3a824e0ebe3619a1634df6 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 5 Jul 2021 14:10:04 +0200
Subject: 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)
---
 src/testdir/check.vim             | 8 ++++++++
 src/testdir/test_clientserver.vim | 4 +---
 src/testdir/test_vim9_builtin.vim | 2 ++
 src/version.c                     | 2 ++
 4 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/testdir/check.vim b/src/testdir/check.vim
index d6bfe004a6..504a1928ef 100644
--- 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()
diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim
index 2704fb668d..a088e178f7 100644
--- 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
diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim
index 38bd8271c8..f6b5a099b7 100644
--- 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
diff --git a/src/version.c b/src/version.c
index 060c2e770d..9b1ac9aa59 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3108,
 /**/
     3107,
 /**/
-- 
cgit v1.2.3