diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-10-29 13:46:40 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-10-29 13:48:03 +0100 |
| commit | 6c43fccb278382e5ce59b6035a84fbdb3e7a1734 (patch) | |
| tree | 8373f50f8d5ac4d1bfaaf19f1a9935c46b9d6699 /src | |
| parent | 20f1bf325cf82ab80206115231e8aeed27253bf5 (diff) | |
| download | rneovim-6c43fccb278382e5ce59b6035a84fbdb3e7a1734.tar.gz rneovim-6c43fccb278382e5ce59b6035a84fbdb3e7a1734.tar.bz2 rneovim-6c43fccb278382e5ce59b6035a84fbdb3e7a1734.zip | |
vim-patch:8.0.0944
Problem: Test_profile is a little bit flaky.
Solution: Accept a match when self and total time are the same. (James
McCoy, closes vim/vim#1972)
https://github.com/vim/vim/commit/d21b16f3c0c676bfe3a37aef1ac3118e1ecded60
Diffstat (limited to 'src')
| -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 f58dba9b14..183f52b8ac 100644 --- a/src/nvim/testdir/test_profile.vim +++ b/src/nvim/testdir/test_profile.vim @@ -121,7 +121,8 @@ func Test_profile_file() " First line of loop executes one more time than body to detect end of loop. call assert_match('^\s*22\s\+\d\+\.\d\+\s\+for i in range(10)$', lines[8]) call assert_equal(' " a comment', lines[9]) - call assert_match('^\s*20\s\+\d\+\.\d\+\s\+\d\+\.\d\+\s\+call Foo()$', lines[10]) + " if self and total are equal we only get one number + 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]) " 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]) diff --git a/src/nvim/version.c b/src/nvim/version.c index 7fd5f2c588..e8d82d3b87 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -160,7 +160,7 @@ static const int included_patches[] = { // 947, // 946, // 945, - // 944, + 944, // 943, // 942, // 941, |