diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-15 20:53:38 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-15 20:53:38 +0100 |
| commit | 065ee9aebf9abe08ae8c0dba7d05cbdcc423c8e0 (patch) | |
| tree | d2d86ff7656a548ffbca0d558d2b741fa1429ae4 | |
| parent | a260b87d9da17f605666630f18c1ed909c2b8bae (diff) | |
| download | vim-git-7.4.1097.tar.gz | |
patch 7.4.1097v7.4.1097
Problem: Looking up the alloc ID for tests fails.
Solution: Fix the line computation. Use assert_fails() for unlet test.
| -rw-r--r-- | src/testdir/runtest.vim | 8 | ||||
| -rw-r--r-- | src/testdir/test_unlet.vim | 21 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 11 insertions, 20 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index 72b21d5ae..fd64c98fc 100644 --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -48,14 +48,16 @@ let s:srcdir = expand('%:p:h:h') " Support function: get the alloc ID by name. function GetAllocId(name) exe 'split ' . s:srcdir . '/alloc.h' - /typedef enum/ - let top = getline('.') + let top = search('typedef enum') + if top == 0 + call add(v:errors, 'typedef not found in alloc.h') + endif let lnum = search('aid_' . a:name . ',') if lnum == 0 call add(v:errors, 'Alloc ID ' . a:name . ' not defined') endif close - return lnum - top + return lnum - top - 1 endfunc diff --git a/src/testdir/test_unlet.vim b/src/testdir/test_unlet.vim index 13ec66b10..4c58785f2 100644 --- a/src/testdir/test_unlet.vim +++ b/src/testdir/test_unlet.vim @@ -1,18 +1,9 @@ " Tests for :unlet func Test_read_only() - try - " this caused a crash - unlet count - catch - call assert_true(v:exception =~ ':E795:') - endtry - try - " this caused a crash - unlet errmsg - catch - call assert_true(v:exception =~ ':E795:') - endtry + " these caused a crash + call assert_fails('unlet count', 'E795:') + call assert_fails('unlet errmsg', 'E795:') endfunc func Test_existing() @@ -24,9 +15,5 @@ endfunc func Test_not_existing() unlet! does_not_exist - try - unlet does_not_exist - catch - call assert_true(v:exception =~ ':E108:') - endtry + call assert_fails('unlet does_not_exist', 'E108:') endfunc diff --git a/src/version.c b/src/version.c index b84211680..a3d0146a6 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1097, +/**/ 1096, /**/ 1095, |