Skip to content

Commit c0bdbfb

Browse files
brammoolbrammool
committed
patch 9.0.1398: profile test repeats the headers many times
Problem: Profile test repeats the headers many times. Solution: Put the headers in script variables.
1 parent 6a7c774 commit c0bdbfb

File tree

2 files changed

+27
-22
lines changed

2 files changed

+27
-22
lines changed

‎src/testdir/test_profile.vim‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ CheckFeature profile
66
source shared.vim
77
source screendump.vim
88

9+
let s:header = 'count total (s) self (s)'
10+
let s:header_func = 'count total (s) self (s) function'
11+
912
func Test_profile_func()
1013
call RunProfileFunc('func', 'let', 'let')
1114
call RunProfileFunc('def', 'var', '')
@@ -71,27 +74,27 @@ func RunProfileFunc(command, declare, assign)
7174
call assert_match('^Total time:\s\+\d\+\.\d\+$', lines[3])
7275
call assert_match('^ Self time:\s\+\d\+\.\d\+$', lines[4])
7376
call assert_equal('', lines[5])
74-
call assert_equal('count total (s) self (s)', lines[6])
77+
call assert_equal(s:header, lines[6])
7578
call assert_equal('', lines[7])
7679
call assert_equal('FUNCTION Foo2()', lines[8])
7780
call assert_equal('Called 1 time', lines[10])
7881
call assert_match('^Total time:\s\+\d\+\.\d\+$', lines[11])
7982
call assert_match('^ Self time:\s\+\d\+\.\d\+$', lines[12])
8083
call assert_equal('', lines[13])
81-
call assert_equal('count total (s) self (s)', lines[14])
84+
call assert_equal(s:header, lines[14])
8285
call assert_match('^\s*1\s\+.*\s\(let\|var\) counter = 100$', lines[15])
8386
call assert_match('^\s*101\s\+.*\swhile counter > 0$', lines[16])
8487
call assert_match('^\s*100\s\+.*\s \(let\)\= counter = counter - 1$', lines[17])
8588
call assert_match('^\s*10[01]\s\+.*\sendwhile$', lines[18])
8689
call assert_match('^\s*1\s\+.\+sleep 1m$', lines[19])
8790
call assert_equal('', lines[20])
8891
call assert_equal('FUNCTIONS SORTED ON TOTAL TIME', lines[21])
89-
call assert_equal('count total (s) self (s) function', lines[22])
92+
call assert_equal(s:header_func, lines[22])
9093
call assert_match('^\s*1\s\+\d\+\.\d\+\s\+Foo2()$', lines[23])
9194
call assert_match('^\s*2\s\+\d\+\.\d\+\s\+Foo1()$', lines[24])
9295
call assert_equal('', lines[25])
9396
call assert_equal('FUNCTIONS SORTED ON SELF TIME', lines[26])
94-
call assert_equal('count total (s) self (s) function', lines[27])
97+
call assert_equal(s:header_func, lines[27])
9598
call assert_match('^\s*1\s\+\d\+\.\d\+\s\+Foo2()$', lines[28])
9699
call assert_match('^\s*2\s\+\d\+\.\d\+\s\+Foo1()$', lines[29])
97100
call assert_equal('', lines[30])
@@ -163,7 +166,7 @@ func Run_profile_func_with_ifelse(command, declare)
163166
call assert_match('^Total time:\s\+\d\+\.\d\+$', lines[3])
164167
call assert_match('^ Self time:\s\+\d\+\.\d\+$', lines[4])
165168
call assert_equal('', lines[5])
166-
call assert_equal('count total (s) self (s)', lines[6])
169+
call assert_equal(s:header, lines[6])
167170
call assert_match('^\s*1\s\+.*\sif 1$', lines[7])
168171
call assert_match('^\s*1\s\+.*\s \(let\|var\) x = 0$', lines[8])
169172
call assert_match( '^\s\+elseif 1$', lines[9])
@@ -177,7 +180,7 @@ func Run_profile_func_with_ifelse(command, declare)
177180
call assert_match('^Total time:\s\+\d\+\.\d\+$', lines[18])
178181
call assert_match('^ Self time:\s\+\d\+\.\d\+$', lines[19])
179182
call assert_equal('', lines[20])
180-
call assert_equal('count total (s) self (s)', lines[21])
183+
call assert_equal(s:header, lines[21])
181184
call assert_match('^\s*1\s\+.*\sif 0$', lines[22])
182185
call assert_match( '^\s\+\(let\|var\) x = 0$', lines[23])
183186
call assert_match('^\s*1\s\+.*\selseif 1$', lines[24])
@@ -191,7 +194,7 @@ func Run_profile_func_with_ifelse(command, declare)
191194
call assert_match('^Total time:\s\+\d\+\.\d\+$', lines[33])
192195
call assert_match('^ Self time:\s\+\d\+\.\d\+$', lines[34])
193196
call assert_equal('', lines[35])
194-
call assert_equal('count total (s) self (s)', lines[36])
197+
call assert_equal(s:header, lines[36])
195198
call assert_match('^\s*1\s\+.*\sif 0$', lines[37])
196199
call assert_match( '^\s\+\(let\|var\) x = 0$', lines[38])
197200
call assert_match('^\s*1\s\+.*\selseif 0$', lines[39])
@@ -201,13 +204,13 @@ func Run_profile_func_with_ifelse(command, declare)
201204
call assert_match('^\s*1\s\+.*\sendif$', lines[43])
202205
call assert_equal('', lines[44])
203206
call assert_equal('FUNCTIONS SORTED ON TOTAL TIME', lines[45])
204-
call assert_equal('count total (s) self (s) function', lines[46])
207+
call assert_equal(s:header_func, lines[46])
205208
call assert_match('^\s*1\s\+\d\+\.\d\+\s\+Foo.()$', lines[47])
206209
call assert_match('^\s*1\s\+\d\+\.\d\+\s\+Foo.()$', lines[48])
207210
call assert_match('^\s*1\s\+\d\+\.\d\+\s\+Foo.()$', lines[49])
208211
call assert_equal('', lines[50])
209212
call assert_equal('FUNCTIONS SORTED ON SELF TIME', lines[51])
210-
call assert_equal('count total (s) self (s) function', lines[52])
213+
call assert_equal(s:header_func, lines[52])
211214
call assert_match('^\s*1\s\+\d\+\.\d\+\s\+Foo.()$', lines[53])
212215
call assert_match('^\s*1\s\+\d\+\.\d\+\s\+Foo.()$', lines[54])
213216
call assert_match('^\s*1\s\+\d\+\.\d\+\s\+Foo.()$', lines[55])
@@ -289,7 +292,7 @@ func Run_profile_func_with_trycatch(command, declare)
289292
call assert_match('^Total time:\s\+\d\+\.\d\+$', lines[3])
290293
call assert_match('^ Self time:\s\+\d\+\.\d\+$', lines[4])
291294
call assert_equal('', lines[5])
292-
call assert_equal('count total (s) self (s)', lines[6])
295+
call assert_equal(s:header, lines[6])
293296
call assert_match('^\s*1\s\+.*\stry$', lines[7])
294297
call assert_match('^\s*1\s\+.*\s \(let\|var\) x = 0$', lines[8])
295298
call assert_match( '^\s\+catch$', lines[9])
@@ -303,7 +306,7 @@ func Run_profile_func_with_trycatch(command, declare)
303306
call assert_match('^Total time:\s\+\d\+\.\d\+$', lines[18])
304307
call assert_match('^ Self time:\s\+\d\+\.\d\+$', lines[19])
305308
call assert_equal('', lines[20])
306-
call assert_equal('count total (s) self (s)', lines[21])
309+
call assert_equal(s:header, lines[21])
307310
call assert_match('^\s*1\s\+.*\stry$', lines[22])
308311
call assert_match('^\s*1\s\+.*\s throw 0$', lines[23])
309312
call assert_match('^\s*1\s\+.*\scatch$', lines[24])
@@ -317,7 +320,7 @@ func Run_profile_func_with_trycatch(command, declare)
317320
call assert_match('^Total time:\s\+\d\+\.\d\+$', lines[33])
318321
call assert_match('^ Self time:\s\+\d\+\.\d\+$', lines[34])
319322
call assert_equal('', lines[35])
320-
call assert_equal('count total (s) self (s)', lines[36])
323+
call assert_equal(s:header, lines[36])
321324
call assert_match('^\s*1\s\+.*\stry$', lines[37])
322325
call assert_match('^\s*1\s\+.*\s throw 0$', lines[38])
323326
call assert_match('^\s*1\s\+.*\scatch$', lines[39])
@@ -327,13 +330,13 @@ func Run_profile_func_with_trycatch(command, declare)
327330
call assert_match( '^\s\+endtry$', lines[43])
328331
call assert_equal('', lines[44])
329332
call assert_equal('FUNCTIONS SORTED ON TOTAL TIME', lines[45])
330-
call assert_equal('count total (s) self (s) function', lines[46])
333+
call assert_equal(s:header_func, lines[46])
331334
call assert_match('^\s*1\s\+\d\+\.\d\+\s\+Foo.()$', lines[47])
332335
call assert_match('^\s*1\s\+\d\+\.\d\+\s\+Foo.()$', lines[48])
333336
call assert_match('^\s*1\s\+\d\+\.\d\+\s\+Foo.()$', lines[49])
334337
call assert_equal('', lines[50])
335338
call assert_equal('FUNCTIONS SORTED ON SELF TIME', lines[51])
336-
call assert_equal('count total (s) self (s) function', lines[52])
339+
call assert_equal(s:header_func, lines[52])
337340
call assert_match('^\s*1\s\+\d\+\.\d\+\s\+Foo.()$', lines[53])
338341
call assert_match('^\s*1\s\+\d\+\.\d\+\s\+Foo.()$', lines[54])
339342
call assert_match('^\s*1\s\+\d\+\.\d\+\s\+Foo.()$', lines[55])
@@ -372,7 +375,7 @@ func Test_profile_file()
372375
call assert_match('^Total time:\s\+\d\+\.\d\+$', lines[2])
373376
call assert_match('^ Self time:\s\+\d\+\.\d\+$', lines[3])
374377
call assert_equal('', lines[4])
375-
call assert_equal('count total (s) self (s)', lines[5])
378+
call assert_equal(s:header, lines[5])
376379
call assert_match(' 2 0.\d\+ func! Foo()', lines[6])
377380
call assert_equal(' endfunc', lines[7])
378381
" Loop iterates 10 times. Since script runs twice, body executes 20 times.
@@ -414,7 +417,7 @@ func Test_profile_file_with_cont()
414417
call assert_match('^Total time:\s\+\d\+\.\d\+$', lines[2])
415418
call assert_match('^ Self time:\s\+\d\+\.\d\+$', lines[3])
416419
call assert_equal('', lines[4])
417-
call assert_equal('count total (s) self (s)', lines[5])
420+
call assert_equal(s:header, lines[5])
418421
call assert_match(' 1 0.\d\+ echo "hello', lines[6])
419422
call assert_equal(' \ world"', lines[7])
420423
call assert_match(' 1 0.\d\+ echo "foo ', lines[8])
@@ -450,15 +453,15 @@ func Test_profile_stop_dump()
450453
call assert_match('^Total time:\s\+\d\+\.\d\+$', lines[3])
451454
call assert_match('^ Self time:\s\+\d\+\.\d\+$', lines[4])
452455
call assert_equal('', lines[5])
453-
call assert_equal('count total (s) self (s)', lines[6])
456+
call assert_equal(s:header, lines[6])
454457
call assert_match('^\s*1\s\+.*\sreturn "Hello"$', lines[7])
455458
call assert_equal('', lines[8])
456459
call assert_equal('FUNCTIONS SORTED ON TOTAL TIME', lines[9])
457-
call assert_equal('count total (s) self (s) function', lines[10])
460+
call assert_equal(s:header_func, lines[10])
458461
call assert_match('^\s*1\s\+\d\+\.\d\+\s\+Xprof_test1()$', lines[11])
459462
call assert_equal('', lines[12])
460463
call assert_equal('FUNCTIONS SORTED ON SELF TIME', lines[13])
461-
call assert_equal('count total (s) self (s) function', lines[14])
464+
call assert_equal(s:header_func, lines[14])
462465
call assert_match('^\s*1\s\+\d\+\.\d\+\s\+Xprof_test1()$', lines[15])
463466
call assert_equal('', lines[16])
464467

@@ -475,15 +478,15 @@ func Test_profile_stop_dump()
475478
call assert_match('^Total time:\s\+\d\+\.\d\+$', lines[3])
476479
call assert_match('^ Self time:\s\+\d\+\.\d\+$', lines[4])
477480
call assert_equal('', lines[5])
478-
call assert_equal('count total (s) self (s)', lines[6])
481+
call assert_equal(s:header, lines[6])
479482
call assert_match('^\s*1\s\+.*\sreturn "World"$', lines[7])
480483
call assert_equal('', lines[8])
481484
call assert_equal('FUNCTIONS SORTED ON TOTAL TIME', lines[9])
482-
call assert_equal('count total (s) self (s) function', lines[10])
485+
call assert_equal(s:header_func, lines[10])
483486
call assert_match('^\s*1\s\+\d\+\.\d\+\s\+Xprof_test2()$', lines[11])
484487
call assert_equal('', lines[12])
485488
call assert_equal('FUNCTIONS SORTED ON SELF TIME', lines[13])
486-
call assert_equal('count total (s) self (s) function', lines[14])
489+
call assert_equal(s:header_func, lines[14])
487490
call assert_match('^\s*1\s\+\d\+\.\d\+\s\+Xprof_test2()$', lines[15])
488491
call assert_equal('', lines[16])
489492

‎src/version.c‎

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

696696
static int included_patches[] =
697697
{ /* Add new patch number below this line */
698+
/**/
699+
1398,
698700
/**/
699701
1397,
700702
/**/

0 commit comments

Comments
 (0)