mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
Merge pull request #5904 from lonerover/vim-7.4.2148
vim-patch:7.4.2148,7.4.2159,7.4.2175,7.4.2295
This commit is contained in:
James McCoy
GitHub
commit
7ed1422521
@ -1294,9 +1294,10 @@ static int cs_kill(exarg_T *eap)
|
||||
}
|
||||
}
|
||||
|
||||
if (i >= csinfo_size || csinfo[i].fname == NULL) {
|
||||
if (p_csverbose)
|
||||
if (!killall && (i >= csinfo_size || csinfo[i].fname == NULL)) {
|
||||
if (p_csverbose) {
|
||||
(void)EMSG2(_("E261: cscope connection %s not found"), stok);
|
||||
}
|
||||
return CSCOPE_FAILURE;
|
||||
} else {
|
||||
if (killall) {
|
||||
|
||||
143
src/nvim/testdir/samples/memfile_test.c
Normal file
143
src/nvim/testdir/samples/memfile_test.c
Normal file
@ -0,0 +1,143 @@
|
||||
/* vi:set ts=8 sts=4 sw=4 noet:
|
||||
*
|
||||
* VIM - Vi IMproved by Bram Moolenaar
|
||||
*
|
||||
* Do ":help uganda" in Vim to read copying and usage conditions.
|
||||
* Do ":help credits" in Vim to see a list of people who contributed.
|
||||
* See README.txt for an overview of the Vim source code.
|
||||
*/
|
||||
|
||||
/*
|
||||
* memfile_test.c: Unittests for memfile.c
|
||||
* Mostly by Ivan Krasilnikov.
|
||||
*/
|
||||
|
||||
#undef NDEBUG
|
||||
#include <assert.h>
|
||||
|
||||
/* Must include main.c because it contains much more than just main() */
|
||||
#define NO_VIM_MAIN
|
||||
#include "main.c"
|
||||
|
||||
/* This file has to be included because the tested functions are static */
|
||||
#include "memfile.c"
|
||||
|
||||
#define index_to_key(i) ((i) ^ 15167)
|
||||
#define TEST_COUNT 50000
|
||||
|
||||
/*
|
||||
* Test mf_hash_*() functions.
|
||||
*/
|
||||
static void
|
||||
test_mf_hash(void)
|
||||
{
|
||||
mf_hashtab_T ht;
|
||||
mf_hashitem_T *item;
|
||||
blocknr_T key;
|
||||
long_u i;
|
||||
long_u num_buckets;
|
||||
|
||||
mf_hash_init(&ht);
|
||||
|
||||
/* insert some items and check invariants */
|
||||
for (i = 0; i < TEST_COUNT; i++)
|
||||
{
|
||||
assert(ht.mht_count == i);
|
||||
|
||||
/* check that number of buckets is a power of 2 */
|
||||
num_buckets = ht.mht_mask + 1;
|
||||
assert(num_buckets > 0 && (num_buckets & (num_buckets - 1)) == 0);
|
||||
|
||||
/* check load factor */
|
||||
assert(ht.mht_count <= (num_buckets << MHT_LOG_LOAD_FACTOR));
|
||||
|
||||
if (i < (MHT_INIT_SIZE << MHT_LOG_LOAD_FACTOR))
|
||||
{
|
||||
/* first expansion shouldn't have occurred yet */
|
||||
assert(num_buckets == MHT_INIT_SIZE);
|
||||
assert(ht.mht_buckets == ht.mht_small_buckets);
|
||||
}
|
||||
else
|
||||
{
|
||||
assert(num_buckets > MHT_INIT_SIZE);
|
||||
assert(ht.mht_buckets != ht.mht_small_buckets);
|
||||
}
|
||||
|
||||
key = index_to_key(i);
|
||||
assert(mf_hash_find(&ht, key) == NULL);
|
||||
|
||||
/* allocate and add new item */
|
||||
item = (mf_hashitem_T *)lalloc_clear(sizeof(mf_hashtab_T), FALSE);
|
||||
assert(item != NULL);
|
||||
item->mhi_key = key;
|
||||
mf_hash_add_item(&ht, item);
|
||||
|
||||
assert(mf_hash_find(&ht, key) == item);
|
||||
|
||||
if (ht.mht_mask + 1 != num_buckets)
|
||||
{
|
||||
/* hash table was expanded */
|
||||
assert(ht.mht_mask + 1 == num_buckets * MHT_GROWTH_FACTOR);
|
||||
assert(i + 1 == (num_buckets << MHT_LOG_LOAD_FACTOR));
|
||||
}
|
||||
}
|
||||
|
||||
/* check presence of inserted items */
|
||||
for (i = 0; i < TEST_COUNT; i++)
|
||||
{
|
||||
key = index_to_key(i);
|
||||
item = mf_hash_find(&ht, key);
|
||||
assert(item != NULL);
|
||||
assert(item->mhi_key == key);
|
||||
}
|
||||
|
||||
/* delete some items */
|
||||
for (i = 0; i < TEST_COUNT; i++)
|
||||
{
|
||||
if (i % 100 < 70)
|
||||
{
|
||||
key = index_to_key(i);
|
||||
item = mf_hash_find(&ht, key);
|
||||
assert(item != NULL);
|
||||
assert(item->mhi_key == key);
|
||||
|
||||
mf_hash_rem_item(&ht, item);
|
||||
assert(mf_hash_find(&ht, key) == NULL);
|
||||
|
||||
mf_hash_add_item(&ht, item);
|
||||
assert(mf_hash_find(&ht, key) == item);
|
||||
|
||||
mf_hash_rem_item(&ht, item);
|
||||
assert(mf_hash_find(&ht, key) == NULL);
|
||||
|
||||
vim_free(item);
|
||||
}
|
||||
}
|
||||
|
||||
/* check again */
|
||||
for (i = 0; i < TEST_COUNT; i++)
|
||||
{
|
||||
key = index_to_key(i);
|
||||
item = mf_hash_find(&ht, key);
|
||||
|
||||
if (i % 100 < 70)
|
||||
{
|
||||
assert(item == NULL);
|
||||
}
|
||||
else
|
||||
{
|
||||
assert(item != NULL);
|
||||
assert(item->mhi_key == key);
|
||||
}
|
||||
}
|
||||
|
||||
/* free hash table and all remaining items */
|
||||
mf_hash_free_all(&ht);
|
||||
}
|
||||
|
||||
int
|
||||
main(void)
|
||||
{
|
||||
test_mf_hash();
|
||||
return 0;
|
||||
}
|
||||
@ -1,9 +1,262 @@
|
||||
" Test for cscope commands.
|
||||
|
||||
if !has('cscope')
|
||||
if !has('cscope') || !executable('cscope') || !has('quickfix')
|
||||
finish
|
||||
endif
|
||||
|
||||
func CscopeSetupOrClean(setup)
|
||||
if a:setup
|
||||
noa sp samples/memfile_test.c
|
||||
saveas! Xmemfile_test.c
|
||||
call system('cscope -bk -fXcscope.out Xmemfile_test.c')
|
||||
call system('cscope -bk -fXcscope2.out Xmemfile_test.c')
|
||||
cscope add Xcscope.out
|
||||
set cscopequickfix=s-,g-,d-,c-,t-,e-,f-,i-,a-
|
||||
else
|
||||
cscope kill -1
|
||||
for file in ['Xcscope.out', 'Xcscope2.out', 'Xmemfile_test.c']
|
||||
call delete(file)
|
||||
endfo
|
||||
endif
|
||||
endfunc
|
||||
|
||||
func Test_cscopeWithCscopeConnections()
|
||||
call CscopeSetupOrClean(1)
|
||||
" Test 0: E568: duplicate cscope database not added
|
||||
try
|
||||
set nocscopeverbose
|
||||
cscope add Xcscope.out
|
||||
set cscopeverbose
|
||||
catch
|
||||
call assert_true(0)
|
||||
endtry
|
||||
call assert_fails('cscope add', 'E560')
|
||||
call assert_fails('cscope add Xcscope.out', 'E568')
|
||||
call assert_fails('cscope add doesnotexist.out', 'E563')
|
||||
|
||||
" Test 1: Find this C-Symbol
|
||||
for cmd in ['cs find s main', 'cs find 0 main']
|
||||
let a=execute(cmd)
|
||||
" Test 1.1 test where it moves the cursor
|
||||
call assert_equal('main(void)', getline('.'))
|
||||
" Test 1.2 test the output of the :cs command
|
||||
call assert_match('\n(1 of 1): <<main>> main(void )', a)
|
||||
endfor
|
||||
|
||||
" Test 2: Find this definition
|
||||
for cmd in ['cs find g test_mf_hash', 'cs find 1 test_mf_hash']
|
||||
exe cmd
|
||||
call assert_equal(['', '/*', ' * Test mf_hash_*() functions.', ' */', ' static void', 'test_mf_hash(void)', '{'], getline(line('.')-5, line('.')+1))
|
||||
endfor
|
||||
|
||||
" Test 3: Find functions called by this function
|
||||
for cmd in ['cs find d test_mf_hash', 'cs find 2 test_mf_hash']
|
||||
let a=execute(cmd)
|
||||
call assert_match('\n(1 of 42): <<mf_hash_init>> mf_hash_init(&ht);', a)
|
||||
call assert_equal(' mf_hash_init(&ht);', getline('.'))
|
||||
endfor
|
||||
|
||||
" Test 4: Find functions calling this function
|
||||
for cmd in ['cs find c test_mf_hash', 'cs find 3 test_mf_hash']
|
||||
let a=execute(cmd)
|
||||
call assert_match('\n(1 of 1): <<main>> test_mf_hash();', a)
|
||||
call assert_equal(' test_mf_hash();', getline('.'))
|
||||
endfor
|
||||
|
||||
" Test 5: Find this text string
|
||||
for cmd in ['cs find t Bram', 'cs find 4 Bram']
|
||||
let a=execute(cmd)
|
||||
call assert_match('(1 of 1): <<<unknown>>> \* VIM - Vi IMproved^Iby Bram Moolenaar', a)
|
||||
call assert_equal(' * VIM - Vi IMproved by Bram Moolenaar', getline('.'))
|
||||
endfor
|
||||
|
||||
" Test 6: Find this egrep pattern
|
||||
" test all matches returned by cscope
|
||||
for cmd in ['cs find e ^\#includ.', 'cs find 6 ^\#includ.']
|
||||
let a=execute(cmd)
|
||||
call assert_match('\n(1 of 3): <<<unknown>>> #include <assert.h>', a)
|
||||
call assert_equal('#include <assert.h>', getline('.'))
|
||||
cnext
|
||||
call assert_equal('#include "main.c"', getline('.'))
|
||||
cnext
|
||||
call assert_equal('#include "memfile.c"', getline('.'))
|
||||
call assert_fails('cnext', 'E553:')
|
||||
endfor
|
||||
|
||||
" Test 7: Find the same egrep pattern using lcscope this time.
|
||||
let a=execute('lcs find e ^\#includ.')
|
||||
call assert_match('\n(1 of 3): <<<unknown>>> #include <assert.h>', a)
|
||||
call assert_equal('#include <assert.h>', getline('.'))
|
||||
lnext
|
||||
call assert_equal('#include "main.c"', getline('.'))
|
||||
lnext
|
||||
call assert_equal('#include "memfile.c"', getline('.'))
|
||||
call assert_fails('lnext', 'E553:')
|
||||
|
||||
" Test 8: Find this file
|
||||
for cmd in ['cs find f Xmemfile_test.c', 'cs find 7 Xmemfile_test.c']
|
||||
enew
|
||||
let a=execute(cmd)
|
||||
call assert_true(a =~ '"Xmemfile_test.c" \d\+L, \d\+C')
|
||||
call assert_equal('Xmemfile_test.c', @%)
|
||||
endfor
|
||||
|
||||
" Test 9: Find files #including this file
|
||||
for cmd in ['cs find i assert.h', 'cs find 8 assert.h']
|
||||
enew
|
||||
let a=execute(cmd)
|
||||
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
|
||||
|
||||
" Test 10: Invalid find command
|
||||
call assert_fails('cs find x', 'E560:')
|
||||
|
||||
" Test 11: Find places where this symbol is assigned a value
|
||||
" this needs a cscope >= 15.8
|
||||
" unfortunately, Travis has cscope version 15.7
|
||||
let cscope_version=systemlist('cscope --version')[0]
|
||||
let cs_version=str2float(matchstr(cscope_version, '\d\+\(\.\d\+\)\?'))
|
||||
if cs_version >= 15.8
|
||||
for cmd in ['cs find a item', 'cs find 9 item']
|
||||
let a=execute(cmd)
|
||||
call assert_equal(['', '(1 of 4): <<test_mf_hash>> item = (mf_hashitem_T *)lalloc_clear(sizeof(mf_hashtab_T), FALSE);'], split(a, '\n', 1))
|
||||
call assert_equal(' item = (mf_hashitem_T *)lalloc_clear(sizeof(mf_hashtab_T), FALSE);', getline('.'))
|
||||
cnext
|
||||
call assert_equal(' item = mf_hash_find(&ht, key);', getline('.'))
|
||||
cnext
|
||||
call assert_equal(' item = mf_hash_find(&ht, key);', getline('.'))
|
||||
cnext
|
||||
call assert_equal(' item = mf_hash_find(&ht, key);', getline('.'))
|
||||
endfor
|
||||
endif
|
||||
|
||||
" Test 12: leading whitespace is not removed for cscope find text
|
||||
let a=execute('cscope find t test_mf_hash')
|
||||
call assert_equal(['', '(1 of 1): <<<unknown>>> test_mf_hash();'], split(a, '\n', 1))
|
||||
call assert_equal(' test_mf_hash();', getline('.'))
|
||||
|
||||
" Test 13: test with scscope
|
||||
let a=execute('scs find t Bram')
|
||||
call assert_match('(1 of 1): <<<unknown>>> \* VIM - Vi IMproved^Iby Bram Moolenaar', a)
|
||||
call assert_equal(' * VIM - Vi IMproved by Bram Moolenaar', getline('.'))
|
||||
|
||||
" Test 14: cscope help
|
||||
for cmd in ['cs', 'cs help', 'cs xxx']
|
||||
let a=execute(cmd)
|
||||
call assert_match('^cscope commands:\n', a)
|
||||
call assert_match('\nadd :', a)
|
||||
call assert_match('\nfind :', a)
|
||||
call assert_match('\nhelp : Show this message', a)
|
||||
call assert_match('\nkill : Kill a connection', a)
|
||||
call assert_match('\nreset: Reinit all connections', a)
|
||||
call assert_match('\nshow : Show connections', a)
|
||||
endfor
|
||||
let a=execute('scscope help')
|
||||
call assert_match('This cscope command does not support splitting the window\.', a)
|
||||
|
||||
" Test 15: reset connections
|
||||
let a=execute('cscope reset')
|
||||
call assert_match('\nAdded cscope database.*Xcscope.out (#0)', a)
|
||||
call assert_match('\nAll cscope databases reset', a)
|
||||
|
||||
" Test 16: cscope show
|
||||
let a=execute('cscope show')
|
||||
call assert_match('\n 0 \d\+.*Xcscope.out\s*<none>', a)
|
||||
|
||||
" Test 17: cstag and 'csto' option
|
||||
set csto=0
|
||||
let a=execute('cstag TEST_COUNT')
|
||||
call assert_match('(1 of 1): <<TEST_COUNT>> #define TEST_COUNT 50000', a)
|
||||
call assert_equal('#define TEST_COUNT 50000', getline('.'))
|
||||
set csto=1
|
||||
let a=execute('cstag index_to_key')
|
||||
call assert_match('(1 of 1): <<index_to_key>> #define index_to_key(i) ((i) ^ 15167)', a)
|
||||
call assert_equal('#define index_to_key(i) ((i) ^ 15167)', getline('.'))
|
||||
call assert_fails('cstag xxx', 'E257:')
|
||||
call assert_fails('cstag', 'E562:')
|
||||
|
||||
" Test 18: 'cst' option
|
||||
set nocst
|
||||
call assert_fails('tag TEST_COUNT', 'E426:')
|
||||
set cst
|
||||
let a=execute('tag TEST_COUNT')
|
||||
call assert_match('(1 of 1): <<TEST_COUNT>> #define TEST_COUNT 50000', a)
|
||||
call assert_equal('#define TEST_COUNT 50000', getline('.'))
|
||||
let a=execute('tags')
|
||||
call assert_match('1 1 TEST_COUNT\s\+\d\+\s\+#define index_to_key', a)
|
||||
|
||||
" Test 19: this should trigger call to cs_print_tags()
|
||||
" Unclear how to check result though, we just exercise the code.
|
||||
set cst cscopequickfix=s0
|
||||
call feedkeys(":cs find s main\<CR>", 't')
|
||||
|
||||
" Test 20: cscope kill
|
||||
call assert_fails('cscope kill 2', 'E261:')
|
||||
call assert_fails('cscope kill xxx', 'E261:')
|
||||
|
||||
let a=execute('cscope kill 0')
|
||||
call assert_match('cscope connection 0 closed', a)
|
||||
|
||||
cscope add Xcscope.out
|
||||
let a=execute('cscope kill Xcscope.out')
|
||||
call assert_match('cscope connection Xcscope.out closed', a)
|
||||
|
||||
cscope add Xcscope.out .
|
||||
let a=execute('cscope kill -1')
|
||||
call assert_match('cscope connection .*Xcscope.out closed', a)
|
||||
let a=execute('cscope kill -1')
|
||||
call assert_equal('', a)
|
||||
|
||||
" Test 21: 'csprg' option
|
||||
call assert_equal('cscope', &csprg)
|
||||
set csprg=doesnotexist
|
||||
call assert_fails('cscope add Xcscope2.out', 'E609:')
|
||||
set csprg=cscope
|
||||
|
||||
" Test 22: multiple cscope connections
|
||||
cscope add Xcscope.out
|
||||
cscope add Xcscope2.out . -C
|
||||
let a=execute('cscope show')
|
||||
call assert_match('\n 0 \d\+.*Xcscope.out\s*<none>', a)
|
||||
call assert_match('\n 1 \d\+.*Xcscope2.out\s*\.', a)
|
||||
|
||||
" Test 23: test Ex command line completion
|
||||
call feedkeys(":cs \<C-A>\<C-B>\"\<CR>", 'tx')
|
||||
call assert_equal('"cs add find help kill reset show', @:)
|
||||
|
||||
call feedkeys(":scs \<C-A>\<C-B>\"\<CR>", 'tx')
|
||||
call assert_equal('"scs find', @:)
|
||||
|
||||
call feedkeys(":cs find \<C-A>\<C-B>\"\<CR>", 'tx')
|
||||
call assert_equal('"cs find a c d e f g i s t', @:)
|
||||
|
||||
call feedkeys(":cs kill \<C-A>\<C-B>\"\<CR>", 'tx')
|
||||
call assert_equal('"cs kill -1 0 1', @:)
|
||||
|
||||
call feedkeys(":cs add Xcscope\<C-A>\<C-B>\"\<CR>", 'tx')
|
||||
call assert_equal('"cs add Xcscope.out Xcscope2.out', @:)
|
||||
|
||||
" Test 24: cscope_connection()
|
||||
call assert_equal(cscope_connection(), 1)
|
||||
call assert_equal(cscope_connection(0, 'out'), 1)
|
||||
call assert_equal(cscope_connection(0, 'xxx'), 1)
|
||||
call assert_equal(cscope_connection(1, 'out'), 1)
|
||||
call assert_equal(cscope_connection(1, 'xxx'), 0)
|
||||
call assert_equal(cscope_connection(2, 'out'), 0)
|
||||
call assert_equal(cscope_connection(3, 'xxx', '..'), 0)
|
||||
call assert_equal(cscope_connection(3, 'out', 'xxx'), 0)
|
||||
call assert_equal(cscope_connection(3, 'out', '.'), 1)
|
||||
call assert_equal(cscope_connection(4, 'out', '.'), 0)
|
||||
|
||||
" CleanUp
|
||||
call CscopeSetupOrClean(0)
|
||||
|
||||
endfunc
|
||||
|
||||
func Test_cscopequickfix()
|
||||
set cscopequickfix=s-,g-,d+,c-,t+,e-,f0,i-,a-
|
||||
call assert_equal('s-,g-,d+,c-,t+,e-,f0,i-,a-', &cscopequickfix)
|
||||
@ -13,3 +266,14 @@ func Test_cscopequickfix()
|
||||
call assert_fails('set cscopequickfix=s7', 'E474:')
|
||||
call assert_fails('set cscopequickfix=s-a', 'E474:')
|
||||
endfunc
|
||||
|
||||
func Test_withoutCscopeConnection()
|
||||
call assert_equal(cscope_connection(), 0)
|
||||
|
||||
call assert_fails('cscope find s main', 'E567:')
|
||||
let a=execute('cscope show')
|
||||
call assert_match('no cscope connections', a)
|
||||
endfunc
|
||||
|
||||
|
||||
" vim: shiftwidth=2 sts=2 expandtab
|
||||
|
||||
@ -145,7 +145,7 @@ static int included_patches[] = {
|
||||
// 2298 NA
|
||||
// 2297 NA
|
||||
// 2296,
|
||||
// 2295,
|
||||
2295,
|
||||
2294,
|
||||
// 2293,
|
||||
// 2292,
|
||||
@ -265,7 +265,7 @@ static int included_patches[] = {
|
||||
// 2178,
|
||||
// 2177,
|
||||
// 2176 NA
|
||||
// 2175,
|
||||
2175,
|
||||
2174,
|
||||
// 2173,
|
||||
// 2172,
|
||||
@ -281,7 +281,7 @@ static int included_patches[] = {
|
||||
2162,
|
||||
// 2161,
|
||||
2160,
|
||||
// 2159,
|
||||
2159,
|
||||
2158,
|
||||
// 2157 NA
|
||||
// 2156 NA
|
||||
@ -292,7 +292,7 @@ static int included_patches[] = {
|
||||
// 2151,
|
||||
// 2150 NA
|
||||
2149,
|
||||
// 2148,
|
||||
2148,
|
||||
2147,
|
||||
2146,
|
||||
// 2145 NA
|
||||
|
||||
Loading…
Reference in New Issue
Block a user