diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-09-11 16:48:50 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-09-11 16:48:50 +0200 |
| commit | e1c8c7a6742be6072290f9aa54ae358060d9c42f (patch) | |
| tree | 411b8150d580883b71b230263958daeab501f5c4 /src | |
| parent | cbeab96f87b91ed4b096216c397552b7f6d270f9 (diff) | |
| download | vim-git-e1c8c7a6742be6072290f9aa54ae358060d9c42f.tar.gz | |
patch 7.4.2364v7.4.2364
Problem: Sort test sometimes fails.
Solution: Add it to the list of flaky tests.
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/runtest.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index 19f1c5fb1..05a105347 100644 --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -144,7 +144,12 @@ else endif " Names of flaky tests. -let s:flaky = ['Test_reltime()', 'Test_nb_basic()', 'Test_communicate()'] +let s:flaky = [ + \ 'Test_reltime()', + \ 'Test_nb_basic()', + \ 'Test_communicate()' + \ 'Test_pipe_through_sort_some()' + \ ] " Locate Test_ functions and execute them. set nomore diff --git a/src/version.c b/src/version.c index 5f1eef54e..103a26f4a 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2364, +/**/ 2363, /**/ 2362, |