diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-10-27 09:48:22 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-10-27 09:48:52 +0800 |
| commit | 2bd424c1c5493f3311239a2c0932dd9ff6fac5a5 (patch) | |
| tree | 1b32351fa6a5691fab4bb4ceb03120c1f3d25579 | |
| parent | aab16e6939a45b3c08f21cd4b5f348e9e612d947 (diff) | |
| download | rneovim-2bd424c1c5493f3311239a2c0932dd9ff6fac5a5.tar.gz rneovim-2bd424c1c5493f3311239a2c0932dd9ff6fac5a5.tar.bz2 rneovim-2bd424c1c5493f3311239a2c0932dd9ff6fac5a5.zip | |
vim-patch:8.0.0194
Problem: Profile tests fails if total and self time are equal.
Solution: Make one time optional.
https://github.com/vim/vim/commit/e32bbded641a5da0263ecf82f9ccc95a8e0a089e
| -rw-r--r-- | src/nvim/testdir/test_profile.vim | 3 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/testdir/test_profile.vim b/src/nvim/testdir/test_profile.vim index 36c05683d5..23d148e47d 100644 --- a/src/nvim/testdir/test_profile.vim +++ b/src/nvim/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/nvim/version.c b/src/nvim/version.c index 3e4d51d70c..7c2cb4d580 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -910,7 +910,7 @@ static const int included_patches[] = { // 197, // 196, 195, - // 194, + 194, // 193 NA // 192 NA // 191 NA |