diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-11-30 15:34:08 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-11-30 15:34:08 +0100 |
| commit | e219f73ed546abeba1ff4f5c08b380d648852222 (patch) | |
| tree | 13b21f27ed28b7521ead0b95c43dd06c87376a86 | |
| parent | dee50a518007b3a59f54b8ad018b6a83993593e7 (diff) | |
| download | vim-git-e219f73ed546abeba1ff4f5c08b380d648852222.tar.gz | |
patch 8.1.2364: termwinscroll test is flaky on FreeBSDv8.1.2364
Problem: Termwinscroll test is flaky on FreeBSD.
Solution: Add to list of flaky tests. Rename function.
| -rw-r--r-- | src/testdir/runtest.vim | 3 | ||||
| -rw-r--r-- | src/testdir/test_terminal.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index c05bd25fe..9372d5364 100644 --- 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 fb810e7f7..0626253c3 100644 --- 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 1bb77a1b1..7bc97da6a 100644 --- a/src/version.c +++ b/src/version.c @@ -738,6 +738,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2364, +/**/ 2363, /**/ 2362, |