diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-09 22:58:21 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-09 22:58:21 +0200 |
| commit | 50fa8dd00c241fa0786fe92ecc02fee4e5d28e06 (patch) | |
| tree | 6cadb244ccd568f55b848fd5c67af7eb95dbe423 /src/testdir | |
| parent | f71d7b9ee5ceba75f70c30845332ddd728fd16c6 (diff) | |
| download | vim-50fa8dd00c241fa0786fe92ecc02fee4e5d28e06.zip | |
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.
Diffstat (limited to 'src/testdir')
| -rw-r--r-- | src/testdir/test_gui.vim | 8 | ||||
| -rw-r--r-- | src/testdir/test_startup.vim | 11 |
2 files changed, 14 insertions, 5 deletions
diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim index d56015cea..d95d991eb 100644 --- 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. diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim index 0522ecc82..8e3238ca1 100644 --- 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 |