Mercurial > vim
changeset 7595:99e93f72ff91 v7.4.1097
commit https://github.com/vim/vim/commit/065ee9aebf9abe08ae8c0dba7d05cbdcc423c8e0
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jan 15 20:53:38 2016 +0100
patch 7.4.1097
Problem: Looking up the alloc ID for tests fails.
Solution: Fix the line computation. Use assert_fails() for unlet test.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 15 Jan 2016 21:00:07 +0100 |
| parents | 1ac8a3077973 |
| children | a9234d9e3efd |
| files | src/testdir/runtest.vim src/testdir/test_unlet.vim src/version.c |
| diffstat | 3 files changed, 11 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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