summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-01-16 22:37:42 +0100
committerBram Moolenaar <Bram@vim.org>2017-01-16 22:37:42 +0100
commitc011a3d083001bcd9853b4447422f1819f3cee2f (patch)
treeeebee65bfa45126a4f3b4b6460c6dfd99298621f
parenta9d23c20879d0dcb289a4db54b3c7df060f87c3c (diff)
downloadvim-git-c011a3d083001bcd9853b4447422f1819f3cee2f.tar.gz
patch 8.0.0196: profile test is slo and does not work on MS-Windowsv8.0.0196
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()
-rw-r--r--src/testdir/test_profile.vim90
-rw-r--r--src/version.c2
2 files changed, 52 insertions, 40 deletions
diff --git a/src/testdir/test_profile.vim b/src/testdir/test_profile.vim
index 23d148e47..5f15d51b4 100644
--- a/src/testdir/test_profile.vim
+++ b/src/testdir/test_profile.vim
@@ -4,16 +4,13 @@ if !has('profile')
endif
func Test_profile_func()
- if !has('unix')
- return
- endif
let lines = [
\ "func! Foo1()",
\ "endfunc",
\ "func! Foo2()",
- \ " let count = 100",
- \ " while count > 0",
- \ " let count = count - 1",
+ \ " let l:count = 100",
+ \ " while l:count > 0",
+ \ " let l:count = l:count - 1",
\ " endwhile",
\ "endfunc",
\ "func! Foo3()",
@@ -35,47 +32,59 @@ func Test_profile_func()
\ ]
call writefile(lines, 'Xprofile_func.vim')
- let a = system(v:progpath
- \ . " -u NONE -i NONE --noplugin"
- \ . " -c 'profile start Xprofile_func.log'"
- \ . " -c 'profile func Foo*'"
- \ . " -c 'so Xprofile_func.vim'"
- \ . " -c 'qall!'")
- let lines = readfile('Xprofile_func.log')
-
- call assert_equal(28, len(lines))
+ call system(v:progpath
+ \ . ' -es -u NONE -U NONE -i NONE --noplugin'
+ \ . ' -c "profile start Xprofile_func.log"'
+ \ . ' -c "profile func Foo*"'
+ \ . ' -c "so Xprofile_func.vim"'
+ \ . ' -c "qall!"')
+ call assert_equal(0, v:shell_error)
- 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])
+ let lines = readfile('Xprofile_func.log')
" - Foo1() is called 3 times but should be reported as called twice
" 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.
" - Unlike Foo3(), Foo2() should not be deleted since there is a check
" for v:profiling.
" - Bar() is not reported since it does not match "profile func Foo*".
- call assert_equal('FUNCTIONS SORTED ON TOTAL TIME', lines[18])
- 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*2\s\+\d\+\.\d\+\s\+Foo1()$', lines[21])
- call assert_equal('', lines[22])
- call assert_equal('FUNCTIONS SORTED ON SELF TIME', lines[23])
- call assert_equal('count total (s) self (s) function', lines[24])
- call assert_match('^\s*1\s\+\d\+\.\d\+\s\+Foo2()$', lines[25])
- call assert_match('^\s*2\s\+\d\+\.\d\+\s\+Foo1()$', lines[26])
- call assert_equal('', lines[27])
+ 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('count total (s) self (s) function', lines[19])
+ call assert_match('^\s*1\s\+\d\+\.\d\+\s\+Foo2()$', lines[20])
+ call assert_match('^\s*2\s\+\d\+\.\d\+\s\+Foo1()$', lines[21])
+ call assert_equal('', lines[22])
+ call assert_equal('FUNCTIONS SORTED ON SELF TIME', lines[23])
+ call assert_equal('count total (s) self (s) function', lines[24])
+ call assert_match('^\s*1\s\+\d\+\.\d\+\s\+Foo2()$', lines[25])
+ call assert_match('^\s*2\s\+\d\+\.\d\+\s\+Foo1()$', lines[26])
+ call assert_equal('', lines[27])
call delete('Xprofile_func.vim')
call delete('Xprofile_func.log')
endfunc
func Test_profile_file()
- if !has('unix')
- return
- endif
let lines = [
\ 'func! Foo()',
\ 'endfunc',
@@ -87,13 +96,14 @@ func Test_profile_file()
\ ]
call writefile(lines, 'Xprofile_file.vim')
- let a = system(v:progpath
- \ . " -u NONE -i NONE --noplugin"
- \ . " -c 'profile start Xprofile_file.log'"
- \ . " -c 'profile file Xprofile_file.vim'"
- \ . " -c 'so Xprofile_file.vim'"
- \ . " -c 'so Xprofile_file.vim'"
- \ . " -c 'qall!'")
+ call system(v:progpath
+ \ . ' -es -u NONE -U NONE -i NONE --noplugin'
+ \ . ' -c "profile start Xprofile_file.log"'
+ \ . ' -c "profile file Xprofile_file.vim"'
+ \ . ' -c "so Xprofile_file.vim"'
+ \ . ' -c "so Xprofile_file.vim"'
+ \ . ' -c "qall!"')
+ call assert_equal(0, v:shell_error)
let lines = readfile('Xprofile_file.log')
diff --git a/src/version.c b/src/version.c
index 28c677696..b0f1c2245 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 196,
+/**/
195,
/**/
194,