diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-08-14 23:13:30 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-08-14 23:13:30 +0200 |
| commit | d21b16f3c0c676bfe3a37aef1ac3118e1ecded60 (patch) | |
| tree | eca6bd2f73afb9cee523a2708855c5367425aa13 | |
| parent | 3678393baa2fbfcd5020fcf0ac12947fc485e912 (diff) | |
| download | vim-git-d21b16f3c0c676bfe3a37aef1ac3118e1ecded60.tar.gz | |
patch 8.0.0944: test_profile is a little bit flakyv8.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 #1972)
| -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 5f15d51b4..f0ef923f3 100644 --- a/src/testdir/test_profile.vim +++ b/src/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/version.c b/src/version.c index 1bb02a1cc..882e3da52 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 944, +/**/ 943, /**/ 942, |