thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.0196: profile test is slo and does not work on MS-Windows

Browse Source 
Problem:    The test for :profile is slow and does not work on MS-Windows.
Solution:   Use the "-es" argument. (Dominique Pelle)  Swap single and double
            quotes for system()
This commit is contained in:
Bram Moolenaar
2017-01-16 22:37:42 +01:00
parent a9d23c2087
commit c011a3d083
2 changed files with 52 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/testdir/test_profile.vim
View File

@@ -4,16 +4,13 @@ if !has('profile')
endif endif
func Test_profile_func() func Test_profile_func()
if !has('unix')
return
endif
let lines = [ let lines = [
\ "func! Foo1()", \ "func! Foo1()",
\ "endfunc", \ "endfunc",
\ "func! Foo2()", \ "func! Foo2()",
\ " let count = 100", \ " let l:count = 100",
\ " while count > 0", \ " while l:count > 0",
\ " let count = count - 1", \ " let l:count = l:count - 1",
\ " endwhile", \ " endwhile",
\ "endfunc", \ "endfunc",
\ "func! Foo3()", \ "func! Foo3()",
@@ -35,28 +32,43 @@ func Test_profile_func()
\ ] \ ]
call writefile(lines, 'Xprofile_func.vim') call writefile(lines, 'Xprofile_func.vim')
let a = system(v:progpath call system(v:progpath
\ . " -u NONE -i NONE --noplugin" \ . ' -es -u NONE -U NONE -i NONE --noplugin'
\ . " -c 'profile start Xprofile_func.log'" \ . ' -c "profile start Xprofile_func.log"'
\ . " -c 'profile func Foo*'" \ . ' -c "profile func Foo*"'
\ . " -c 'so Xprofile_func.vim'" \ . ' -c "so Xprofile_func.vim"'
\ . " -c 'qall!'") \ . ' -c "qall!"')
call assert_equal(0, v:shell_error)
let lines = readfile('Xprofile_func.log') let lines = readfile('Xprofile_func.log')
call assert_equal(28, len(lines))
call assert_equal('FUNCTION Foo1()', lines[0])
call assert_equal('Called 2 times', lines[1])
call assert_equal('FUNCTION Foo2()', lines[7])
call assert_equal('Called 1 time', lines[8])
" - Foo1() is called 3 times but should be reported as called twice " - Foo1() is called 3 times but should be reported as called twice
" since one call is in between "profile pause" .. "profile continue". " since one call is in between "profile pause" .. "profile continue".
" - Foo2() should come before Foo1() since Foo1() does much more work.\ " - Foo2() should come before Foo1() since Foo1() does much more work.
" - Foo3() is not reported because function is deleted. " - Foo3() is not reported because function is deleted.
" - Unlike Foo3(), Foo2() should not be deleted since there is a check " - Unlike Foo3(), Foo2() should not be deleted since there is a check
" for v:profiling. " for v:profiling.
" - Bar() is not reported since it does not match "profile func Foo*". " - Bar() is not reported since it does not match "profile func Foo*".
call assert_equal(28, len(lines))
call assert_equal('FUNCTION Foo1()', lines[0])
call assert_equal('Called 2 times', lines[1])
call assert_match('^Total time:\s\+\d\+\.\d\+$', lines[2])
call assert_match('^ Self time:\s\+\d\+\.\d\+$', lines[3])
call assert_equal('', lines[4])
call assert_equal('count total (s) self (s)', lines[5])
call assert_equal('', lines[6])
call assert_equal('FUNCTION Foo2()', lines[7])
call assert_equal('Called 1 time', lines[8])
call assert_match('^Total time:\s\+\d\+\.\d\+$', lines[9])
call assert_match('^ Self time:\s\+\d\+\.\d\+$', lines[10])
call assert_equal('', lines[11])
call assert_equal('count total (s) self (s)', lines[12])
call assert_match('^\s*1\s\+.*\slet l:count = 100$', lines[13])
call assert_match('^\s*101\s\+.*\swhile l:count > 0$', lines[14])
call assert_match('^\s*100\s\+.*\s let l:count = l:count - 1$', lines[15])
call assert_match('^\s*100\s\+.*\sendwhile$', lines[16])
call assert_equal('', lines[17])
call assert_equal('FUNCTIONS SORTED ON TOTAL TIME', lines[18]) call assert_equal('FUNCTIONS SORTED ON TOTAL TIME', lines[18])
call assert_equal('count total (s) self (s) function', lines[19]) call assert_equal('count total (s) self (s) function', lines[19])
call assert_match('^\s*1\s\+\d\+\.\d\+\s\+Foo2()$', lines[20]) call assert_match('^\s*1\s\+\d\+\.\d\+\s\+Foo2()$', lines[20])
@@ -73,9 +85,6 @@ func Test_profile_func()
endfunc endfunc
func Test_profile_file() func Test_profile_file()
if !has('unix')
return
endif
let lines = [ let lines = [
\ 'func! Foo()', \ 'func! Foo()',
\ 'endfunc', \ 'endfunc',
@@ -87,13 +96,14 @@ func Test_profile_file()
\ ] \ ]
call writefile(lines, 'Xprofile_file.vim') call writefile(lines, 'Xprofile_file.vim')
let a = system(v:progpath call system(v:progpath
\ . " -u NONE -i NONE --noplugin" \ . ' -es -u NONE -U NONE -i NONE --noplugin'
\ . " -c 'profile start Xprofile_file.log'" \ . ' -c "profile start Xprofile_file.log"'
\ . " -c 'profile file Xprofile_file.vim'" \ . ' -c "profile file Xprofile_file.vim"'
\ . " -c 'so Xprofile_file.vim'" \ . ' -c "so Xprofile_file.vim"'
\ . " -c 'so Xprofile_file.vim'" \ . ' -c "so Xprofile_file.vim"'
\ . " -c 'qall!'") \ . ' -c "qall!"')
call assert_equal(0, v:shell_error)
let lines = readfile('Xprofile_file.log') let lines = readfile('Xprofile_file.log')

2
src/version.c
View File

@@ -764,6 +764,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 */
/**/
196,
/**/ /**/
195, 195,
/**/ /**/