From 04ba397fe9c33faf00173396285ee98fbb12b63c Mon Sep 17 00:00:00 2001 From: wjiang Date: Fri, 25 Apr 2025 16:54:01 +0800 Subject: [PATCH] enable check and fix some tests failed --- vim-8.0-copy-paste.patch | 12 ++++++++++++ vim.spec | 11 ++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/vim-8.0-copy-paste.patch b/vim-8.0-copy-paste.patch index bd5bbd4..8249ae3 100644 --- a/vim-8.0-copy-paste.patch +++ b/vim-8.0-copy-paste.patch @@ -33,6 +33,18 @@ index ed0c6c1..90c8c40 100644 call setline(1, ["one one one", "two tXo two", "three three three"]) set balloonevalterm balloonexpr=MyBalloonExpr()..s:trailing balloondelay=100 let s:trailing = '<' " check that script context is set +diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim +index d930133..0c74032 100644 +--- a/src/testdir/test_popup.vim ++++ b/src/testdir/test_popup.vim +@@ -945,6 +945,7 @@ func Test_mouse_popup_position() + let script =<< trim END + set mousemodel=popup_setpos + source $VIMRUNTIME/menu.vim ++ set mouse=a + call setline(1, join(range(20))) + func Trigger(col) + call test_setmouse(1, a:col) diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim index b91689e..c6b70d1 100644 --- a/src/testdir/test_popupwin.vim diff --git a/vim.spec b/vim.spec index 532e2d5..bddeb62 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ Name: vim Epoch: 2 Version: %{baseversion}.%{patchlevel} -Release: 2 +Release: 3 Summary: Vim is a highly configurable text editor for efficiently creating and changing any kind of text. License: Vim AND LGPL-2.1-or-later AND MIT AND GPL-1.0-only AND (GPL-2.0-only OR Vim) AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND GPL-2.0-or-later AND GPL-3.0-or-later AND OPUBL-1.0 AND Apache-2.0 WITH Swift-exception URL: https://www.vim.org @@ -325,6 +325,12 @@ popd > %{_datadir}/%{name}/vimfiles/doc/tags || : %{_bindir}/vim -c ":helptags %{_datadir}/%{name}/vimfiles/doc" -c :q &> /dev/null || : +%check +export TERM=xterm +# Run glvs tests requires Internet, but most build env don't have. Skip them +export TEST_SKIP_PAT=Test_glvs +LC_ALL=en_US.UTF-8 make -j1 test || echo "Warning: Please check tests." + %files common %license LICENSE %doc README* @@ -422,6 +428,9 @@ popd %{_mandir}/man1/evim.* %changelog +* Fri Apr 25 2025 wangjiang - 2:9.1.1166-3 +- enable check and fix some tests failed + * Tue Mar 18 2025 wangjiang - 2:9.1.1166-2 - fix CVE-2025-29768 -- Gitee