diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-01-15 21:12:48 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-01-15 21:12:48 +0100 |
| commit | e32bbded641a5da0263ecf82f9ccc95a8e0a089e (patch) | |
| tree | eeb2e7fa47e8bb3791eacaea58362736c9c28efa | |
| parent | 1b9750d8054ce4a5a6f84af9f10654330bbf869b (diff) | |
| download | vim-git-e32bbded641a5da0263ecf82f9ccc95a8e0a089e.tar.gz | |
patch 8.0.0194: profile tests fails if total and self time are equalv8.0.0194
Problem: Profile tests fails if total and self time are equal.
Solution: Make one time optional.
| -rw-r--r-- | src/testdir/test_profile.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/test_profile.vim b/src/testdir/test_profile.vim index 36c05683d..23d148e47 100644 --- a/src/testdir/test_profile.vim +++ b/src/testdir/test_profile.vim @@ -113,7 +113,8 @@ func Test_profile_file() call assert_equal(' " a comment', lines[9]) call assert_match('^\s*20\s\+\d\+\.\d\+\s\+\d\+\.\d\+\s\+call Foo()$', lines[10]) call assert_match('^\s*20\s\+\d\+\.\d\+\s\+endfor$', lines[11]) - call assert_match('^\s*2\s\+\d\+\.\d\+\s\+\d\+\.\d\+\s\+call Foo()$', lines[12]) + " if self and total are equal we only get one number + call assert_match('^\s*2\s\+\(\d\+\.\d\+\s\+\)\=\d\+\.\d\+\s\+call Foo()$', lines[12]) call assert_equal('', lines[13]) call delete('Xprofile_file.vim') diff --git a/src/version.c b/src/version.c index 401f79fe3..cfb4e5969 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 */ /**/ + 194, +/**/ 193, /**/ 192, |