Skip to content

Commit 26d7116

Browse files
committed
patch 8.2.2997: Vim9: disassemble test fails
Problem: Vim9: disassemble test fails. Solution: Adjust expected output.
1 parent b69c6fb commit 26d7116

2 files changed

Lines changed: 17 additions & 5 deletions

File tree

src/testdir/test_vim9_disassemble.vim

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2146,6 +2146,7 @@ enddef
21462146

21472147
def s:Profiled(): string
21482148
echo "profiled"
2149+
var some = "some text"
21492150
return "done"
21502151
enddef
21512152

@@ -2159,24 +2160,33 @@ def Test_profiled()
21592160
'\d PROFILE START line 1\_s*' ..
21602161
'\d PUSHS "profiled"\_s*' ..
21612162
'\d ECHO 1\_s*' ..
2162-
'return "done"\_s*' ..
2163+
'var some = "some text"\_s*' ..
21632164
'\d PROFILE END\_s*' ..
21642165
'\d PROFILE START line 2\_s*' ..
2166+
'\d PUSHS "some text"\_s*' ..
2167+
'\d STORE $0\_s*' ..
2168+
'return "done"\_s*' ..
2169+
'\d PROFILE END\_s*' ..
2170+
'\d PROFILE START line 3\_s*' ..
21652171
'\d PUSHS "done"\_s*' ..
2166-
'\d RETURN\_s*' ..
2167-
'\d PROFILE END',
2172+
'\d\+ RETURN\_s*' ..
2173+
'\d\+ PROFILE END',
21682174
res)
21692175
enddef
21702176

21712177
def Test_debugged()
21722178
var res = execute('disass debug s:Profiled')
21732179
assert_match('<SNR>\d*_Profiled\_s*' ..
21742180
'echo "profiled"\_s*' ..
2175-
'\d DEBUG line 1\_s*' ..
2181+
'\d DEBUG line 1 varcount 0\_s*' ..
21762182
'\d PUSHS "profiled"\_s*' ..
21772183
'\d ECHO 1\_s*' ..
2184+
'var some = "some text"\_s*' ..
2185+
'\d DEBUG line 2 varcount 0\_s*' ..
2186+
'\d PUSHS "some text"\_s*' ..
2187+
'\d STORE $0\_s*' ..
21782188
'return "done"\_s*' ..
2179-
'\d DEBUG line 2\_s*' ..
2189+
'\d DEBUG line 3 varcount 1\_s*' ..
21802190
'\d PUSHS "done"\_s*' ..
21812191
'\d RETURN\_s*',
21822192
res)

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,8 @@ static char *(features[]) =
750750

751751
static int included_patches[] =
752752
{ /* Add new patch number below this line */
753+
/**/
754+
2997,
753755
/**/
754756
2996,
755757
/**/

0 commit comments

Comments
 (0)