Permalink
Browse files

patch 7.4.2187

Problem:    glob2regpat test fails on Windows.
Solution:   Remove the checks that use backslashes.
1 parent 36d1c0f commit 7547a78446c1a3c04b36c0533f0f046188bd378b @brammool brammool committed Aug 8, 2016
Showing with 10 additions and 4 deletions.
  1. +8 −4 src/testdir/test_glob2regpat.vim
  2. +2 −0 src/version.c
@@ -9,14 +9,18 @@ endfunc
func Test_valid()
call assert_equal('^foo\.', glob2regpat('foo.*'))
call assert_equal('^foo.$', glob2regpat('foo?'))
- call assert_equal('^foo?$', glob2regpat('foo\?'))
call assert_equal('\.vim$', glob2regpat('*.vim'))
call assert_equal('^[abc]$', glob2regpat('[abc]'))
call assert_equal('^foo bar$', glob2regpat('foo\ bar'))
call assert_equal('^foo,bar$', glob2regpat('foo,bar'))
call assert_equal('^\(foo\|bar\)$', glob2regpat('{foo,bar}'))
- call assert_equal('^\(foo,bar\|foobar\)$', glob2regpat('{foo\,bar,foobar}'))
- call assert_equal('^{foo,bar}$', glob2regpat('\{foo,bar\}'))
- call assert_equal('^\\\(foo\|bar\\\)$', glob2regpat('\\{foo,bar\\}'))
call assert_equal('.*', glob2regpat('**'))
+
+ if has('unix')
+ call assert_equal('^foo?$', glob2regpat('foo\?'))
+ call assert_equal('^\(foo,bar\|foobar\)$', glob2regpat('{foo\,bar,foobar}'))
+ call assert_equal('^{foo,bar}$', glob2regpat('\{foo,bar\}'))
+ call assert_equal('^\\\(foo\|bar\\\)$', glob2regpat('\\{foo,bar\\}'))
+ " todo: Windows
+ endif
endfunc
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2187,
+/**/
2186,
/**/
2185,

0 comments on commit 7547a78

Please sign in to comment.