patch 7.4.2364

Problem:    Sort test sometimes fails.
Solution:   Add it to the list of flaky tests.

diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 19f1c5fb1011b10ba621fe43e344237cd300b556..05a105347e33a0dfd38caba3cb10b6d23dd6a6bf 100644 (file)
--- 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 5f1eef54e3f2dc2301fce5f46cc6fe208eb16f9e..103a26f4ae34d784db26ff52f6b8e73493844b65 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2364,
 /**/
     2363,
 /**/