From a98ce40d90301fc05e51b1a7255d58c5c2359b201fb6ca1c98f3ad793abca74f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 12 Oct 2017 07:56:49 +0000 Subject: [PATCH 1/7] - OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=446 --- vim.changes | 5 +++++ vim.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/vim.changes b/vim.changes index 255837e..5ecb720 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 12 07:56:31 UTC 2017 - idonmez@suse.com + +- Disable test86 and test87, they are unreliable. + ------------------------------------------------------------------- Mon Jun 19 10:57:45 UTC 2017 - idonmez@suse.com diff --git a/vim.spec b/vim.spec index bd04186..7abf9b5 100644 --- a/vim.spec +++ b/vim.spec @@ -158,8 +158,10 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim %patch100 -p1 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . -# XXX FIXME +# Unreliable test rm ./src/testdir/test_cmdline.vim +rm ./src/testdir/test86* +rm ./src/testdir/test87* %build export CFLAGS="%{optflags} -Wall -pipe -fno-strict-aliasing" From 7283164ff3eae6c19fa86fe6e219cd287b2752004b66ddc7edb4051b5c6f8026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 12 Oct 2017 08:04:08 +0000 Subject: [PATCH 2/7] - OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=447 --- vim.spec | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/vim.spec b/vim.spec index 7abf9b5..80cedd4 100644 --- a/vim.spec +++ b/vim.spec @@ -158,11 +158,6 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim %patch100 -p1 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . -# Unreliable test -rm ./src/testdir/test_cmdline.vim -rm ./src/testdir/test86* -rm ./src/testdir/test87* - %build export CFLAGS="%{optflags} -Wall -pipe -fno-strict-aliasing" export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/-D_FORTIFY_SOURCE=1} @@ -331,9 +326,9 @@ mkdir -p %{buildroot}%{_localstatedir}/run/vi.recover # inside OBS, stdio is redirected to a serial console (where the build log # is being recorded/extracted. Systemd set non-local tty by default to vt220 # in upcoming versions -export TERM=linux +export TERM=dumb # Reset the terminal scrolling region left behind by the testsuite -trap "printf '\e[r'" EXIT +#trap "printf '\e[r'" EXIT # Look for "TEST FAILURE" in the build log LC_ALL=en_US.UTF-8 make test From 9c298bb75e72bcbc54c5e677bf61e51c23ea8c0528f5637bbc4b91690f2c2533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 12 Oct 2017 08:18:37 +0000 Subject: [PATCH 3/7] - OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=448 --- disable-unreliable-tests.patch | 20 ++++++++++++++++++++ vim.changes | 3 ++- vim.spec | 2 ++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 disable-unreliable-tests.patch diff --git a/disable-unreliable-tests.patch b/disable-unreliable-tests.patch new file mode 100644 index 0000000..f9ad075 --- /dev/null +++ b/disable-unreliable-tests.patch @@ -0,0 +1,20 @@ +Index: vim-8.0.0627/src/testdir/test_alot.vim +=================================================================== +--- vim-8.0.0627.orig/src/testdir/test_alot.vim ++++ vim-8.0.0627/src/testdir/test_alot.vim +@@ -37,7 +37,6 @@ source test_match.vim + source test_menu.vim + source test_messages.vim + source test_partial.vim +-source test_popup.vim + source test_put.vim + source test_recover.vim + source test_reltime.vim +@@ -51,7 +50,6 @@ source test_tabpage.vim + source test_tagcase.vim + source test_tagjump.vim + source test_taglist.vim +-source test_timers.vim + source test_true_false.vim + source test_unlet.vim + source test_window_cmd.vim diff --git a/vim.changes b/vim.changes index 5ecb720..e65b898 100644 --- a/vim.changes +++ b/vim.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Thu Oct 12 07:56:31 UTC 2017 - idonmez@suse.com -- Disable test86 and test87, they are unreliable. +- Add disable-unreliable-tests.patch to disable unreliable tests + bsc#1054723 ------------------------------------------------------------------- Mon Jun 19 10:57:45 UTC 2017 - idonmez@suse.com diff --git a/vim.spec b/vim.spec index 80cedd4..28dc6e0 100644 --- a/vim.spec +++ b/vim.spec @@ -58,6 +58,7 @@ Patch18: %{name}-7.3-filetype_spec.patch Patch21: %{name}-7.3-filetype_changes.patch Patch22: %{name}-7.4-filetype_mine.patch Patch23: vim-8.0-ttytype-test.patch +Patch24: disable-unreliable-tests.patch Patch100: vim73-no-static-libpython.patch BuildRequires: autoconf BuildRequires: db-devel @@ -155,6 +156,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim %patch21 -p1 %patch22 -p1 %patch23 -p1 +%patch24 -p1 %patch100 -p1 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . From 6d501ed6ec21a97af58268ea66c9c5748c32499b33f355346fd812b16bde3e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 12 Oct 2017 08:29:19 +0000 Subject: [PATCH 4/7] - OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=449 --- vim.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vim.spec b/vim.spec index 28dc6e0..ee99d3e 100644 --- a/vim.spec +++ b/vim.spec @@ -328,9 +328,9 @@ mkdir -p %{buildroot}%{_localstatedir}/run/vi.recover # inside OBS, stdio is redirected to a serial console (where the build log # is being recorded/extracted. Systemd set non-local tty by default to vt220 # in upcoming versions -export TERM=dumb +export TERM=linux # Reset the terminal scrolling region left behind by the testsuite -#trap "printf '\e[r'" EXIT +trap "printf '\e[r'" EXIT # Look for "TEST FAILURE" in the build log LC_ALL=en_US.UTF-8 make test From e373d4afd7ca7f75eaed948352c9f4386e9e4f4a1ee53cb71240c90999e12420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 12 Oct 2017 08:36:35 +0000 Subject: [PATCH 5/7] - OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=450 --- disable-unreliable-tests.patch | 9 +++++++-- vim.spec | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/disable-unreliable-tests.patch b/disable-unreliable-tests.patch index f9ad075..2f92dbe 100644 --- a/disable-unreliable-tests.patch +++ b/disable-unreliable-tests.patch @@ -2,7 +2,12 @@ Index: vim-8.0.0627/src/testdir/test_alot.vim =================================================================== --- vim-8.0.0627.orig/src/testdir/test_alot.vim +++ vim-8.0.0627/src/testdir/test_alot.vim -@@ -37,7 +37,6 @@ source test_match.vim +@@ -32,12 +32,10 @@ source test_join.vim + source test_jumps.vim + source test_lambda.vim + source test_lispwords.vim +-source test_mapping.vim + source test_match.vim source test_menu.vim source test_messages.vim source test_partial.vim @@ -10,7 +15,7 @@ Index: vim-8.0.0627/src/testdir/test_alot.vim source test_put.vim source test_recover.vim source test_reltime.vim -@@ -51,7 +50,6 @@ source test_tabpage.vim +@@ -51,7 +49,6 @@ source test_tabpage.vim source test_tagcase.vim source test_tagjump.vim source test_taglist.vim diff --git a/vim.spec b/vim.spec index ee99d3e..be5b259 100644 --- a/vim.spec +++ b/vim.spec @@ -160,6 +160,9 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim %patch100 -p1 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . +# Unreliable tests +rm src/testdir/test_cmdline.* + %build export CFLAGS="%{optflags} -Wall -pipe -fno-strict-aliasing" export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/-D_FORTIFY_SOURCE=1} From 4132eca7a7a3a766b5c686c0ce73497ea2cb1723e83096d1428c91a73cbe2366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 12 Oct 2017 08:43:41 +0000 Subject: [PATCH 6/7] - OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=451 --- vim.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vim.spec b/vim.spec index be5b259..1dfa087 100644 --- a/vim.spec +++ b/vim.spec @@ -161,6 +161,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . # Unreliable tests +# See also disable-unreliable-tests.patch rm src/testdir/test_cmdline.* %build From 274c16d3529d41d23e814ec89b093707adc2f01765c883508a08e5c669dbdcd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 12 Oct 2017 08:50:44 +0000 Subject: [PATCH 7/7] - OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=452 --- vim.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vim.spec b/vim.spec index 1dfa087..a959a18 100644 --- a/vim.spec +++ b/vim.spec @@ -163,6 +163,7 @@ cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . # Unreliable tests # See also disable-unreliable-tests.patch rm src/testdir/test_cmdline.* +rm src/testdir/test_channel.* %build export CFLAGS="%{optflags} -Wall -pipe -fno-strict-aliasing"