patch 8.1.2364: termwinscroll test is flaky on FreeBSD

Problem:    Termwinscroll test is flaky on FreeBSD.
Solution:   Add to list of flaky tests.  Rename function.

diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index c05bd25fe89cd5707e9f62815ddbfd7bb9130081..9372d53640d7e4789f6d4f5a3b0995a7626c0daa 100644 (file)
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -3,7 +3,7 @@
 " Errors are appended to the test.log file.
 "
 " To execute only specific test functions, add a second argument.  It will be
-" matched against the names of the Test_ funtion.  E.g.:
+" matched against the names of the Test_ function.  E.g.:
 "      ../vim -u NONE -S runtest.vim test_channel.vim open_delay
 " The output can be found in the "messages" file.
 "
@@ -365,6 +365,7 @@ let s:flaky_tests = [
       \ 'Test_terminal_wall()',
       \ 'Test_terminal_wipe_buffer()',
       \ 'Test_terminal_wqall()',
+      \ 'Test_termwinscroll()',
       \ 'Test_timer_oneshot()',
       \ 'Test_timer_paused()',
       \ 'Test_timer_repeat_many()',

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index fb810e7f787235d484c0fd0917b76c1b1a20f8e7..0626253c334d3c03264b6365c5950653a45e66cd 100644 (file)
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1827,7 +1827,7 @@ func Test_terminal_out_err()
   call delete(outfile)
 endfunc
 
-func Test_terminwinscroll()
+func Test_termwinscroll()
   CheckUnix
 
   " Let the terminal output more than 'termwinscroll' lines, some at the start

diff --git a/src/version.c b/src/version.c
index 1bb77a1b1d5b602cef8ce82c9aab9de6c3584a43..7bc97da6a25d4600aaa5d6dea9dabb0de7385dcf 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -737,6 +737,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2364,
 /**/
     2363,
 /**/