0
0
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00

patch 7.4.881

Problem:    Test 49 fails.
Solution:   Add line number to check of call stack.
This commit is contained in:
Bram Moolenaar 2015-09-25 17:56:50 +02:00
parent 02d803fc0c
commit 0a777ab989
2 changed files with 15 additions and 13 deletions

View File

@ -1,6 +1,6 @@
" Vim script language tests " Vim script language tests
" Author: Servatius Brandt <Servatius.Brandt@fujitsu-siemens.com> " Author: Servatius Brandt <Servatius.Brandt@fujitsu-siemens.com>
" Last Change: 2013 Jun 06 " Last Change: 2015 Sep 25
"------------------------------------------------------------------------------- "-------------------------------------------------------------------------------
" Test environment {{{1 " Test environment {{{1
@ -5188,19 +5188,19 @@ catch /.*/
Xpath 65536 " X: 65536 Xpath 65536 " X: 65536
let exception = v:exception let exception = v:exception
let throwpoint = v:throwpoint let throwpoint = v:throwpoint
call CHECK(1, "oops", '\<F\.\.G\.\.T\>', '\<2\>') call CHECK(1, "oops", '\<F\[1]\.\.G\[1]\.\.T\>', '\<2\>')
exec "let exception = v:exception" exec "let exception = v:exception"
exec "let throwpoint = v:throwpoint" exec "let throwpoint = v:throwpoint"
call CHECK(2, "oops", '\<F\.\.G\.\.T\>', '\<2\>') call CHECK(2, "oops", '\<F\[1]\.\.G\[1]\.\.T\>', '\<2\>')
CmdException CmdException
CmdThrowpoint CmdThrowpoint
call CHECK(3, "oops", '\<F\.\.G\.\.T\>', '\<2\>') call CHECK(3, "oops", '\<F\[1]\.\.G\[1]\.\.T\>', '\<2\>')
call FuncException() call FuncException()
call FuncThrowpoint() call FuncThrowpoint()
call CHECK(4, "oops", '\<F\.\.G\.\.T\>', '\<2\>') call CHECK(4, "oops", '\<F\[1]\.\.G\[1]\.\.T\>', '\<2\>')
exec "source" scriptException exec "source" scriptException
exec "source" scriptThrowPoint exec "source" scriptThrowPoint
call CHECK(5, "oops", '\<F\.\.G\.\.T\>', '\<2\>') call CHECK(5, "oops", '\<F\[1]\.\.G\[1]\.\.T\>', '\<2\>')
try try
Xpath 131072 " X: 131072 Xpath 131072 " X: 131072
call G("arrgh", 4) call G("arrgh", 4)
@ -5208,7 +5208,7 @@ catch /.*/
Xpath 262144 " X: 262144 Xpath 262144 " X: 262144
let exception = v:exception let exception = v:exception
let throwpoint = v:throwpoint let throwpoint = v:throwpoint
call CHECK(6, "arrgh", '\<G\.\.T\>', '\<4\>') call CHECK(6, "arrgh", '\<G\[1]\.\.T\>', '\<4\>')
try try
Xpath 524288 " X: 524288 Xpath 524288 " X: 524288
let g:arg = "autsch" let g:arg = "autsch"
@ -5226,7 +5226,7 @@ catch /.*/
Xpath 2097152 " X: 2097152 Xpath 2097152 " X: 2097152
let exception = v:exception let exception = v:exception
let throwpoint = v:throwpoint let throwpoint = v:throwpoint
call CHECK(8, "arrgh", '\<G\.\.T\>', '\<4\>') call CHECK(8, "arrgh", '\<G\[1]\.\.T\>', '\<4\>')
try try
Xpath 4194304 " X: 4194304 Xpath 4194304 " X: 4194304
let g:arg = "brrrr" let g:arg = "brrrr"
@ -5242,27 +5242,27 @@ catch /.*/
Xpath 16777216 " X: 16777216 Xpath 16777216 " X: 16777216
let exception = v:exception let exception = v:exception
let throwpoint = v:throwpoint let throwpoint = v:throwpoint
call CHECK(10, "arrgh", '\<G\.\.T\>', '\<4\>') call CHECK(10, "arrgh", '\<G\[1]\.\.T\>', '\<4\>')
endtry endtry
Xpath 33554432 " X: 33554432 Xpath 33554432 " X: 33554432
let exception = v:exception let exception = v:exception
let throwpoint = v:throwpoint let throwpoint = v:throwpoint
call CHECK(11, "arrgh", '\<G\.\.T\>', '\<4\>') call CHECK(11, "arrgh", '\<G\[1]\.\.T\>', '\<4\>')
endtry endtry
Xpath 67108864 " X: 67108864 Xpath 67108864 " X: 67108864
let exception = v:exception let exception = v:exception
let throwpoint = v:throwpoint let throwpoint = v:throwpoint
call CHECK(12, "arrgh", '\<G\.\.T\>', '\<4\>') call CHECK(12, "arrgh", '\<G\[1]\.\.T\>', '\<4\>')
finally finally
Xpath 134217728 " X: 134217728 Xpath 134217728 " X: 134217728
let exception = v:exception let exception = v:exception
let throwpoint = v:throwpoint let throwpoint = v:throwpoint
call CHECK(13, "oops", '\<F\.\.G\.\.T\>', '\<2\>') call CHECK(13, "oops", '\<F\[1]\.\.G\[1]\.\.T\>', '\<2\>')
endtry endtry
Xpath 268435456 " X: 268435456 Xpath 268435456 " X: 268435456
let exception = v:exception let exception = v:exception
let throwpoint = v:throwpoint let throwpoint = v:throwpoint
call CHECK(14, "oops", '\<F\.\.G\.\.T\>', '\<2\>') call CHECK(14, "oops", '\<F\[1]\.\.G\[1]\.\.T\>', '\<2\>')
finally finally
Xpath 536870912 " X: 536870912 Xpath 536870912 " X: 536870912
let exception = v:exception let exception = v:exception

View File

@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
881,
/**/ /**/
880, 880,
/**/ /**/