diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-30 10:56:50 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-30 10:56:50 +0200 |
| commit | 4792255eff03760dca0fd014616532e6d47db364 (patch) | |
| tree | b036d2cdc688c102d257ccc35d9e6bc541afc700 | |
| parent | 64cefedfc834aa4dac54ae5f91ccbc04e2d56bc5 (diff) | |
| download | vim-git-4792255eff03760dca0fd014616532e6d47db364.tar.gz | |
patch 7.4.2295v7.4.2295
Problem: Cscope test fails.
Solution: Avoid checking for specific line and column numbers.
| -rw-r--r-- | src/testdir/test_cscope.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/testdir/test_cscope.vim b/src/testdir/test_cscope.vim index e9ed49037..4e78faa9f 100644 --- a/src/testdir/test_cscope.vim +++ b/src/testdir/test_cscope.vim @@ -97,7 +97,7 @@ func Test_cscopeWithCscopeConnections() for cmd in ['cs find f Xmemfile_test.c', 'cs find 7 Xmemfile_test.c'] enew 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', @%) endfor @@ -105,7 +105,10 @@ func Test_cscopeWithCscopeConnections() for cmd in ['cs find i assert.h', 'cs find 8 assert.h'] enew 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('.')) endfor diff --git a/src/version.c b/src/version.c index d881342b1..f0f9c827f 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 */ /**/ + 2295, +/**/ 2294, /**/ 2293, |