changeset 9830:6049c1f01391 v7.4.2190

commit https://github.com/vim/vim/commit/50fa8dd00c241fa0786fe92ecc02fee4e5d28e06 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Aug 9 22:58:21 2016 +0200 patch 7.4.2190 Problem: When startup test fails it's not easy to find out why. GUI test fails with Gnome. Solution: Add the help entry matches to a list an assert that. Set $HOME for Gnome to create .gnome2 directory.
author Christian Brabandt <cb@256bit.org>
date Tue, 09 Aug 2016 23:00:08 +0200
parents 73f5a9508c37
children 7fd691232941
files src/testdir/test_gui.vim src/testdir/test_startup.vim src/version.c
diffstat 3 files changed, 16 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -9,6 +9,14 @@ func SetUp()
   if has("gui_kde")
     set guifont=Courier\ 10\ Pitch/8/-1/5/50/0/0/0/0/0
   endif
+
+  " Gnome insists on creating $HOME/.gnome2/..
+  call mkdir('Xhome')
+  let $HOME = fnamemodify('Xhome', ':p')
+endfunc
+
+func TearDown()
+  call delete('Xhome', 'rf')
 endfunc
 
 " Test for resetting "secure" flag after GUI has started.
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -72,16 +72,17 @@ func Test_help_arg()
     call assert_match('Vi IMproved', lines[0])
 
     " check if  couple of lines are there
-    let found = 0
+    let found = []
     for line in lines
       if line =~ '-R.*Readonly mode'
-	let found += 1
+	call add(found, 'Readonly mode')
       endif
-      if line =~ '--version'
-	let found += 1
+      " Watch out for a second --version line in the Gnome version.
+      if line =~ '--version.*Print version information and exit'
+	call add(found, "--version")
       endif
     endfor
-    call assert_equal(2, found)
+    call assert_equal(['Readonly mode', '--version'], found)
   endif
   call delete('Xtestout')
 endfunc
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2190,
+/**/
     2189,
 /**/
     2188,