summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Brabandt <cb@256bit.org>2023-03-06 15:29:29 +0000
committerBram Moolenaar <Bram@vim.org>2023-03-06 15:29:29 +0000
commitcf3c1ca276aa8f9fada7b7cd0197bbb0f91e0950 (patch)
treec073b1017a422be37f8d25d64e1532241edfcca1
parent30585e03a7ce6cf985f93ca30275bf4dae0d87cc (diff)
patch 9.0.1387: scrollbar test sporadically failsv9.0.1387
Problem: Scrollbar test sporadically fails. Solution: Mark the scrollbar test as flaky. (Christian Brabandt, closes #12113)
-rw-r--r--src/testdir/test_gui.vim5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index 6b5e12c2f3..809dd3579c 100644
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -718,8 +718,11 @@ func Test_set_guioptions()
endfunc
func Test_scrollbars()
- new
+ " this test sometimes fails on CI
+ let g:test_is_flaky = 1
+
" buffer with 200 lines
+ new
call setline(1, repeat(['one', 'two'], 100))
set guioptions+=rlb
diff --git a/src/version.c b/src/version.c
index 994ddb9a8c..e590919f89 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1387,
+/**/
1386,
/**/
1385,