patch 8.2.3093: tablabel_tooltip test fails with Athena

Problem:    tablabel_tooltip test fails with Athena. (Dominique Pellé)
Solution:   Skip the test when using Athena. (closes #8508)

diff --git a/src/testdir/check.vim b/src/testdir/check.vim
index 4c5f3eef5d28d9e39811621e5b6ad011848b7b2c..d6bfe004a62fe4063881bb49f55ddeeec854f191 100644 (file)
--- a/src/testdir/check.vim
+++ b/src/testdir/check.vim
@@ -14,6 +14,17 @@ func CheckFeature(name)
   endif
 endfunc
 
+" Command to check for the absence of a feature.
+command -nargs=1 CheckNotFeature call CheckNotFeature(<f-args>)
+func CheckNotFeature(name)
+  if !has(a:name, 1)
+    throw 'Checking for non-existent feature ' .. a:name
+  endif
+  if has(a:name)
+    throw 'Skipped: ' .. a:name .. ' feature present'
+  endif
+endfunc
+
 " Command to check for the presence of a working option.
 command -nargs=1 CheckOption call CheckOption(<f-args>)
 func CheckOption(name)

diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index 762e332edc7ac1699eef105affa422236b4a3857..b727372a2694c2061bf5ad7440d120994eb0d687 100644 (file)
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -1118,6 +1118,8 @@ func TestGuiTabToolTip()
 endfunc
 
 func Test_gui_tablabel_tooltip()
+  CheckNotFeature gui_athena
+
   %bw!
   " Removing the tabline at the end of this test, reduces the window height by
   " one. Save and restore it after the test.

diff --git a/src/version.c b/src/version.c
index 0d4fc1242df7ff84505f4e4b52125dcfc8cf526f..3b8a50a70180356d24f765ebf7c28d0683f58ef4 100644 (file)
--- 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 */
+/**/
+    3093,
 /**/
     3092,
 /**/