summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-07-03 19:16:00 +0200
committerBram Moolenaar <Bram@vim.org>2018-07-03 19:16:00 +0200
commit851332ea9cdabf24980a7f7c293da81fa990f864 (patch)
treea5eafaab0e0c0fef01fb076c61f814379e205ab8
parentb2e0c94a4d27e3e6222d26f13e0418a85cab21a2 (diff)
patch 8.1.0145: test with grep is failing on MS-Windowsv8.1.0145
Problem: Test with grep is failing on MS-Windows. Solution: Skip the test.
-rw-r--r--src/testdir/test_quickfix.vim19
-rw-r--r--src/version.c2
2 files changed, 13 insertions, 8 deletions
diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim
index 5e8b993962..a4006b07d1 100644
--- a/src/testdir/test_quickfix.vim
+++ b/src/testdir/test_quickfix.vim
@@ -3457,14 +3457,17 @@ func Xautocmd_changelist(cchar)
call assert_equal(4, line('.'))
autocmd! QuickFixCmdPost
- " Test for grep/lgrep
- call g:Xsetlist([], 'f')
- Xexpr 'Xtestfile1:2:Line2'
- autocmd QuickFixCmdPost * Xolder
- silent Xgrep Line5 Xtestfile2
- call assert_equal('Xtestfile2', bufname(''))
- call assert_equal(5, line('.'))
- autocmd! QuickFixCmdPost
+ " The grepprg may not be set on non-Unix systems
+ if has('unix')
+ " Test for grep/lgrep
+ call g:Xsetlist([], 'f')
+ Xexpr 'Xtestfile1:2:Line2'
+ autocmd QuickFixCmdPost * Xolder
+ silent Xgrep Line5 Xtestfile2
+ call assert_equal('Xtestfile2', bufname(''))
+ call assert_equal(5, line('.'))
+ autocmd! QuickFixCmdPost
+ endif
" Test for vimgrep/lvimgrep
call g:Xsetlist([], 'f')
diff --git a/src/version.c b/src/version.c
index 07e34fc37f..ea289c7ec7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -790,6 +790,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 145,
+/**/
144,
/**/
143,