Skip to content

Commit 4792255

Browse files
committed
patch 7.4.2295
Problem: Cscope test fails. Solution: Avoid checking for specific line and column numbers.
1 parent 64cefed commit 4792255

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

src/testdir/test_cscope.vim

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,18 @@ func Test_cscopeWithCscopeConnections()
9797
for cmd in ['cs find f Xmemfile_test.c', 'cs find 7 Xmemfile_test.c']
9898
enew
9999
let a=execute(cmd)
100-
call assert_match('\n"Xmemfile_test.c" 143L, 3137C', a)
100+
call assert_true(a =~ '"Xmemfile_test.c" \d\+L, \d\+C')
101101
call assert_equal('Xmemfile_test.c', @%)
102102
endfor
103103

104104
" Test 9: Find files #including this file
105105
for cmd in ['cs find i assert.h', 'cs find 8 assert.h']
106106
enew
107107
let a=execute(cmd)
108-
call assert_equal(['','"Xmemfile_test.c" 143L, 3137C','(1 of 1): <<global>> #include <assert.h>'], split(a, '\n', 1))
108+
let alines = split(a, '\n', 1)
109+
call assert_equal('', alines[0])
110+
call assert_true(alines[1] =~ '"Xmemfile_test.c" \d\+L, \d\+C')
111+
call assert_equal('(1 of 1): <<global>> #include <assert.h>', alines[2])
109112
call assert_equal('#include <assert.h>', getline('.'))
110113
endfor
111114

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,8 @@ static char *(features[]) =
763763

764764
static int included_patches[] =
765765
{ /* Add new patch number below this line */
766+
/**/
767+
2295,
766768
/**/
767769
2294,
768770
/**/

0 commit comments

Comments
 (0)