patch 7.4.2295

Problem:    Cscope test fails.
Solution:   Avoid checking for specific line and column numbers.
This commit is contained in:
Bram Moolenaar
2016-08-30 10:56:50 +02:00
parent 64cefedfc8
commit 4792255eff
2 changed files with 7 additions and 2 deletions

View File

@ -97,7 +97,7 @@ func Test_cscopeWithCscopeConnections()
for cmd in ['cs find f Xmemfile_test.c', 'cs find 7 Xmemfile_test.c'] for cmd in ['cs find f Xmemfile_test.c', 'cs find 7 Xmemfile_test.c']
enew enew
let a=execute(cmd) let a=execute(cmd)
call assert_match('\n"Xmemfile_test.c" 143L, 3137C', a) call assert_true(a =~ '"Xmemfile_test.c" \d\+L, \d\+C')
call assert_equal('Xmemfile_test.c', @%) call assert_equal('Xmemfile_test.c', @%)
endfor endfor
@ -105,7 +105,10 @@ func Test_cscopeWithCscopeConnections()
for cmd in ['cs find i assert.h', 'cs find 8 assert.h'] for cmd in ['cs find i assert.h', 'cs find 8 assert.h']
enew enew
let a=execute(cmd) let a=execute(cmd)
call assert_equal(['','"Xmemfile_test.c" 143L, 3137C','(1 of 1): <<global>> #include <assert.h>'], split(a, '\n', 1)) let alines = split(a, '\n', 1)
call assert_equal('', alines[0])
call assert_true(alines[1] =~ '"Xmemfile_test.c" \d\+L, \d\+C')
call assert_equal('(1 of 1): <<global>> #include <assert.h>', alines[2])
call assert_equal('#include <assert.h>', getline('.')) call assert_equal('#include <assert.h>', getline('.'))
endfor endfor

View File

@ -763,6 +763,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2295,
/**/ /**/
2294, 2294,
/**/ /**/