From e4ca460b9b0ea2c7cda9c16fbae8523c76d155fd Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 14 Oct 2021 14:16:30 +0200 Subject: [PATCH] 2011749 - Update test suite to work without default mouse behavior Resolves: rhbz#2011749 --- vim-8.0-copy-paste.patch | 63 ++++++++++++++++++++++++++++++++++++++-- vim.spec | 1 + 2 files changed, 61 insertions(+), 3 deletions(-) diff --git a/vim-8.0-copy-paste.patch b/vim-8.0-copy-paste.patch index 203cbb7..73870cd 100644 --- a/vim-8.0-copy-paste.patch +++ b/vim-8.0-copy-paste.patch @@ -1,6 +1,7 @@ -diff -up vim82/runtime/defaults.vim.copypaste vim82/runtime/defaults.vim ---- vim82/runtime/defaults.vim.copypaste 2020-10-06 17:03:19.276066889 +0200 -+++ vim82/runtime/defaults.vim 2020-10-06 17:04:30.437448603 +0200 +diff --git a/runtime/defaults.vim b/runtime/defaults.vim +index f3c639b..20637e2 100644 +--- a/runtime/defaults.vim ++++ b/runtime/defaults.vim @@ -73,18 +73,6 @@ map Q gq " Revert with ":iunmap ". inoremap u @@ -20,3 +21,59 @@ diff -up vim82/runtime/defaults.vim.copypaste vim82/runtime/defaults.vim " Only do this part when Vim was compiled with the +eval feature. if 1 +diff --git a/src/testdir/test_balloon.vim b/src/testdir/test_balloon.vim +index 319e546..8fcf63c 100644 +--- a/src/testdir/test_balloon.vim ++++ b/src/testdir/test_balloon.vim +@@ -9,6 +9,7 @@ source screendump.vim + CheckScreendump + + let s:common_script =<< trim [CODE] ++ set mouse=a + call setline(1, ["one one one", "two tXo two", "three three three"]) + set balloonevalterm balloonexpr=MyBalloonExpr() balloondelay=100 + func MyBalloonExpr() +diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim +index f13252b..ec755a4 100644 +--- a/src/testdir/test_popupwin.vim ++++ b/src/testdir/test_popupwin.vim +@@ -553,6 +553,7 @@ func Test_popup_drag() + " create a popup that covers the command line + let lines =<< trim END + call setline(1, range(1, 20)) ++ set mouse=a + split + vsplit + $wincmd w +@@ -599,6 +600,7 @@ func Test_popup_drag_termwin() + let lines =<< trim END + set foldmethod=marker + call setline(1, range(100)) ++ set mouse=a + for nr in range(7) + call setline(nr * 12 + 1, "fold {{{") + call setline(nr * 12 + 11, "end }}}") +@@ -652,6 +654,7 @@ func Test_popup_close_with_mouse() + + let lines =<< trim END + call setline(1, range(1, 20)) ++ set mouse=a + " With border, can click on X + let winid = popup_create('foobar', #{ + \ close: 'button', +@@ -1479,6 +1482,7 @@ func Test_popup_beval() + let lines =<< trim END + call setline(1, range(1, 20)) + call setline(5, 'here is some text to hover over') ++ set mouse=a + set balloonevalterm + set balloonexpr=BalloonExpr() + set balloondelay=100 +@@ -2170,6 +2174,7 @@ func Test_popup_scrollbar() + + let lines =<< trim END + call setline(1, range(1, 20)) ++ set mouse=a + hi ScrollThumb ctermbg=blue + hi ScrollBar ctermbg=red + let winid = popup_create(['one', 'two', 'three', 'four', 'five', diff --git a/vim.spec b/vim.spec index cd11fc2..2b9cdc5 100644 --- a/vim.spec +++ b/vim.spec @@ -838,6 +838,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags - 2011412 - test suite fails on apache/httpd filetype tests - 2011424 - Remove vim-7.4-syncolor.patch - 2011429 - Remove downstream patch vim-7.4-nowarning.patch +- 2011749 - Update test suite to work without default mouse behavior * Tue Aug 10 2021 Mohan Boddu - 2:8.2.2637-5 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags