diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-06 23:03:59 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-06 23:03:59 +0200 |
| commit | 3321e9d8a36c91c62d8ba3d43430b5c213b87f8b (patch) | |
| tree | a90dc20b86ba4b5905b5421141483474255b7b7c | |
| parent | 472a0a880a709c027f4b19cfa56c08e78818112d (diff) | |
| download | vim-git-3321e9d8a36c91c62d8ba3d43430b5c213b87f8b.tar.gz | |
patch 7.4.2173v7.4.2173
Problem: Can't test help on MS-Windows.
Solution: Skip the test.
| -rw-r--r-- | src/testdir/test_startup.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim index d2463f476..f21f4c35b 100644 --- a/src/testdir/test_startup.vim +++ b/src/testdir/test_startup.vim @@ -62,6 +62,10 @@ func Test_after_comes_later() endfunc func Test_help_arg() + if !has('unix') && has('gui') + " this doesn't work with gvim on MS-Windows + return + endif if RunVim([], [], '--help >Xtestout') let lines = readfile('Xtestout') call assert_true(len(lines) > 20) diff --git a/src/version.c b/src/version.c index a7af2939f..9cf031bdf 100644 --- 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 */ /**/ + 2173, +/**/ 2172, /**/ 2171, |