- Disable more tests failing randomly on OBS:

* test_arglist
    * test_command_count
    * test_diffmode
    * test_mksession
    * test_startup
    * test_window_cmd

OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=594

disable-unreliable-tests.patch

@@ -1,7 +1,7 @@
-Index: vim-8.2.0200/src/testdir/Make_all.mak
+Index: vim-8.2.0348/src/testdir/Make_all.mak
 ===================================================================
---- vim-8.2.0200.orig/src/testdir/Make_all.mak
+--- vim-8.2.0348.orig/src/testdir/Make_all.mak
-+++ vim-8.2.0200/src/testdir/Make_all.mak
++++ vim-8.2.0348/src/testdir/Make_all.mak
 @@ -54,7 +54,6 @@ NEW_TESTS = \
  	test_autoload \
  	test_backspace_opt \
@@ -10,7 +10,7 @@ Index: vim-8.2.0200/src/testdir/Make_all.mak
  	test_balloon_gui \
  	test_behave \
  	test_blob \
-@@ -184,7 +183,6 @@ NEW_TESTS = \
+@@ -185,7 +184,6 @@ NEW_TESTS = \
  	test_netbeans \
  	test_normal \
  	test_number \
@@ -18,7 +18,7 @@ Index: vim-8.2.0200/src/testdir/Make_all.mak
  	test_packadd \
  	test_partial \
  	test_paste \
-@@ -299,7 +297,6 @@ NEW_TESTS_RES = \
+@@ -301,7 +299,6 @@ NEW_TESTS_RES = \
  	test_autocmd.res \
  	test_autoload.res \
  	test_backspace_opt.res \
@@ -26,10 +26,10 @@ Index: vim-8.2.0200/src/testdir/Make_all.mak
  	test_balloon_gui.res \
  	test_blob.res \
  	test_blockedit.res \
-Index: vim-8.2.0200/src/testdir/Makefile
+Index: vim-8.2.0348/src/testdir/Makefile
 ===================================================================
---- vim-8.2.0200.orig/src/testdir/Makefile
+--- vim-8.2.0348.orig/src/testdir/Makefile
-+++ vim-8.2.0200/src/testdir/Makefile
++++ vim-8.2.0348/src/testdir/Makefile
 @@ -36,8 +36,6 @@ SCRIPTS = $(SCRIPTS_ALL) \
  # Explicit dependencies.
  test49.out: test49.vim

vim-7.3-filetype_changes.patch

@@ -1,7 +1,7 @@
-Index: vim-8.1.1467/runtime/filetype.vim
+Index: vim-8.2.0348/runtime/filetype.vim
 ===================================================================
---- vim-8.1.1467.orig/runtime/filetype.vim
+--- vim-8.2.0348.orig/runtime/filetype.vim
-+++ vim-8.1.1467/runtime/filetype.vim
++++ vim-8.2.0348/runtime/filetype.vim
 @@ -314,6 +314,9 @@ au BufNewFile,BufRead *.css			setf css
  " Century Term Command Scripts (*.cmd too)
  au BufNewFile,BufRead *.con			setf cterm
@@ -12,10 +12,10 @@ Index: vim-8.1.1467/runtime/filetype.vim
  " Changelog
  au BufNewFile,BufRead changelog.Debian,changelog.dch,NEWS.Debian,NEWS.dch
  					\	setf debchangelog
-Index: vim-8.1.1467/runtime/syntax/changes.vim
+Index: vim-8.2.0348/runtime/syntax/changes.vim
 ===================================================================
 --- /dev/null
-+++ vim-8.1.1467/runtime/syntax/changes.vim
++++ vim-8.2.0348/runtime/syntax/changes.vim
 @@ -0,0 +1,41 @@
 +" Vim syntax file
 +" Filename:     changes.vim

vim-7.3-filetype_ftl.patch

@@ -1,8 +1,8 @@
-Index: vim-8.1.1467/runtime/filetype.vim
+Index: vim-8.2.0348/runtime/filetype.vim
 ===================================================================
---- vim-8.1.1467.orig/runtime/filetype.vim
+--- vim-8.2.0348.orig/runtime/filetype.vim
-+++ vim-8.1.1467/runtime/filetype.vim
++++ vim-8.2.0348/runtime/filetype.vim
-@@ -2201,3 +2201,7 @@ endfunc
+@@ -2232,3 +2232,7 @@ endfunc
  " Restore 'cpoptions'
  let &cpo = s:cpo_save
  unlet s:cpo_save
@@ -10,10 +10,10 @@ Index: vim-8.1.1467/runtime/filetype.vim
 +" FreeMarker templates
 +au BufNewFile,BufRead *.ftl     setf ftl
 +
-Index: vim-8.1.1467/runtime/syntax/ftl.vim
+Index: vim-8.2.0348/runtime/syntax/ftl.vim
 ===================================================================
 --- /dev/null
-+++ vim-8.1.1467/runtime/syntax/ftl.vim
++++ vim-8.2.0348/runtime/syntax/ftl.vim
 @@ -0,0 +1,36 @@
 +" Vim syntax file
 +" Language:	FreeMarker Template Language (FTL)

vim-7.3-filetype_spec.patch

@@ -1,7 +1,7 @@
-Index: vim-8.2.0314/runtime/filetype.vim
+Index: vim-8.2.0348/runtime/filetype.vim
 ===================================================================
---- vim-8.2.0314.orig/runtime/filetype.vim
+--- vim-8.2.0348.orig/runtime/filetype.vim
-+++ vim-8.2.0314/runtime/filetype.vim
++++ vim-8.2.0348/runtime/filetype.vim
 @@ -1581,7 +1581,7 @@ au BufNewFile,BufRead *.hog,snort.conf,v
  au BufNewFile,BufRead *.rules			call dist#ft#FTRules()
  
@@ -11,10 +11,10 @@ Index: vim-8.2.0314/runtime/filetype.vim
  
  " Speedup (AspenTech plant simulator)
  au BufNewFile,BufRead *.speedup,*.spdata,*.spd	setf spup
-Index: vim-8.2.0314/runtime/syntax/spec.vim
+Index: vim-8.2.0348/runtime/syntax/spec.vim
 ===================================================================
---- vim-8.2.0314.orig/runtime/syntax/spec.vim
+--- vim-8.2.0348.orig/runtime/syntax/spec.vim
-+++ vim-8.2.0314/runtime/syntax/spec.vim
++++ vim-8.2.0348/runtime/syntax/spec.vim
 @@ -102,7 +102,7 @@ syn case ignore
  "%% PreAmble Section %%
  "Copyright and Serial were deprecated by License and Epoch

vim-7.3-gvimrc_fontset.patch

@@ -1,8 +1,8 @@
-Index: vim-8.1.1467/runtime/gvimrc_example.vim
+Index: vim-8.2.0348/runtime/gvimrc_example.vim
 ===================================================================
---- vim-8.1.1467.orig/runtime/gvimrc_example.vim
+--- vim-8.2.0348.orig/runtime/gvimrc_example.vim
-+++ vim-8.1.1467/runtime/gvimrc_example.vim
++++ vim-8.2.0348/runtime/gvimrc_example.vim
-@@ -14,9 +14,6 @@
+@@ -15,9 +15,6 @@
  " Make external commands work through a pipe instead of a pseudo-tty
  "set noguipty
  
@@ -12,7 +12,7 @@ Index: vim-8.1.1467/runtime/gvimrc_example.vim
  set ch=2		" Make command line two lines high
  
  set mousehide		" Hide the mouse when typing text
-@@ -52,3 +49,29 @@ if version >= 500
+@@ -53,3 +50,29 @@ if version >= 500
    highlight Special gui=NONE guibg=grey95
  
  endif

vim-7.3-help_tags.patch

@@ -1,8 +1,8 @@
-Index: vim-8.2.0200/runtime/doc/Makefile
+Index: vim-8.2.0348/runtime/doc/Makefile
 ===================================================================
---- vim-8.2.0200.orig/runtime/doc/Makefile
+--- vim-8.2.0348.orig/runtime/doc/Makefile
-+++ vim-8.2.0200/runtime/doc/Makefile
++++ vim-8.2.0348/runtime/doc/Makefile
-@@ -323,6 +323,7 @@ CONVERTED = \
+@@ -325,6 +325,7 @@ CONVERTED = \
  all: tags vim.man evim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED)
  
  # Use Vim to generate the tags file.  Can only be used when Vim has been

vim-7.3-mktemp_tutor.patch

@@ -1,7 +1,7 @@
-Index: vim-8.1.1467/src/vimtutor
+Index: vim-8.2.0348/src/vimtutor
 ===================================================================
---- vim-8.1.1467.orig/src/vimtutor
+--- vim-8.2.0348.orig/src/vimtutor
-+++ vim-8.1.1467/src/vimtutor
++++ vim-8.2.0348/src/vimtutor
 @@ -24,8 +24,7 @@ xx=$1
  export xx
  

vim-7.3-name_vimrc.patch

@@ -1,8 +1,8 @@
-Index: vim-8.1.2383/src/feature.h
+Index: vim-8.2.0348/src/feature.h
 ===================================================================
---- vim-8.1.2383.orig/src/feature.h
+--- vim-8.2.0348.orig/src/feature.h
-+++ vim-8.1.2383/src/feature.h
++++ vim-8.2.0348/src/feature.h
-@@ -815,11 +815,12 @@
+@@ -822,11 +822,12 @@
   * SYS_VIMRC_FILE	Name of the system-wide .vimrc file.
   */
  // #define SYS_VIMRC_FILE	"/etc/vimrc"

vim-7.3-sh_is_bash.patch

@@ -1,7 +1,7 @@
-Index: vim-8.1.1467/runtime/syntax/sh.vim
+Index: vim-8.2.0348/runtime/syntax/sh.vim
 ===================================================================
---- vim-8.1.1467.orig/runtime/syntax/sh.vim
+--- vim-8.2.0348.orig/runtime/syntax/sh.vim
-+++ vim-8.1.1467/runtime/syntax/sh.vim
++++ vim-8.2.0348/runtime/syntax/sh.vim
 @@ -64,6 +64,13 @@ if !exists("b:is_kornshell") && !exists(
    endif
  endif

vim-7.3-use_awk.patch

@@ -1,7 +1,7 @@
-Index: vim-8.1.1467/runtime/tools/mve.awk
+Index: vim-8.2.0348/runtime/tools/mve.awk
 ===================================================================
---- vim-8.1.1467.orig/runtime/tools/mve.awk
+--- vim-8.2.0348.orig/runtime/tools/mve.awk
-+++ vim-8.1.1467/runtime/tools/mve.awk
++++ vim-8.2.0348/runtime/tools/mve.awk
 @@ -1,4 +1,4 @@
 -#!/usr/bin/nawk -f
 +#!/usr/bin/awk -f

vim-7.4-disable_lang_no.patch

@@ -1,7 +1,7 @@
-Index: vim-8.1.1467/src/po/Make_all.mak
+Index: vim-8.2.0348/src/po/Make_all.mak
 ===================================================================
---- vim-8.1.1467.orig/src/po/Make_all.mak
+--- vim-8.2.0348.orig/src/po/Make_all.mak
-+++ vim-8.1.1467/src/po/Make_all.mak
++++ vim-8.2.0348/src/po/Make_all.mak
 @@ -24,7 +24,6 @@ LANGUAGES = \
  		lv \
  		nb \
@@ -10,7 +10,7 @@ Index: vim-8.1.1467/src/po/Make_all.mak
  		pl \
  		pl.UTF-8 \
  		pl.cp1250 \
-@@ -107,7 +106,6 @@ MOFILES = \
+@@ -109,7 +108,6 @@ MOFILES = \
  		lv.mo \
  		nb.mo \
  		nl.mo \
@@ -18,7 +18,7 @@ Index: vim-8.1.1467/src/po/Make_all.mak
  		pl.mo \
  		pt_BR.mo \
  		ru.mo \
-@@ -156,7 +154,6 @@ CHECKFILES = \
+@@ -159,7 +157,6 @@ CHECKFILES = \
  		lv.ck \
  		nb.ck \
  		nl.ck \

vim-7.4-filetype_apparmor.patch

@@ -1,7 +1,7 @@
-Index: vim-8.1.1467/runtime/filetype.vim
+Index: vim-8.2.0348/runtime/filetype.vim
 ===================================================================
---- vim-8.1.1467.orig/runtime/filetype.vim
+--- vim-8.2.0348.orig/runtime/filetype.vim
-+++ vim-8.1.1467/runtime/filetype.vim
++++ vim-8.2.0348/runtime/filetype.vim
 @@ -101,6 +101,10 @@ au BufNewFile,BufRead *.ino,*.pde		setf
  au BufNewFile,BufRead .htaccess,*/etc/httpd/*.conf		setf apache
  au BufNewFile,BufRead */etc/apache2/sites-*/*.com		setf apache

vim-7.4-filetype_mine.patch

@@ -1,7 +1,7 @@
-Index: vim-8.1.1467/runtime/filetype.vim
+Index: vim-8.2.0348/runtime/filetype.vim
 ===================================================================
---- vim-8.1.1467.orig/runtime/filetype.vim
+--- vim-8.2.0348.orig/runtime/filetype.vim
-+++ vim-8.1.1467/runtime/filetype.vim
++++ vim-8.2.0348/runtime/filetype.vim
 @@ -17,7 +17,7 @@ augroup filetypedetect
  
  " Ignored extensions

vim-7.4-highlight_fstab.patch

@@ -1,7 +1,7 @@
-Index: vim-8.1.1561/runtime/syntax/fstab.vim
+Index: vim-8.2.0348/runtime/syntax/fstab.vim
 ===================================================================
---- vim-8.1.1561.orig/runtime/syntax/fstab.vim
+--- vim-8.2.0348.orig/runtime/syntax/fstab.vim
-+++ vim-8.1.1561/runtime/syntax/fstab.vim
++++ vim-8.2.0348/runtime/syntax/fstab.vim
 @@ -35,7 +35,7 @@ syn match fsOperator /[,=:#]/
  " Device
  syn cluster fsDeviceCluster contains=fsOperator,fsDeviceKeyword,fsDeviceError

vim-8.0-ttytype-test.patch

@@ -1,8 +1,8 @@
-Index: vim-8.1.2052/src/testdir/test_options.vim
+Index: vim-8.2.0348/src/testdir/test_options.vim
 ===================================================================
---- vim-8.1.2052.orig/src/testdir/test_options.vim
+--- vim-8.2.0348.orig/src/testdir/test_options.vim
-+++ vim-8.1.2052/src/testdir/test_options.vim
++++ vim-8.2.0348/src/testdir/test_options.vim
-@@ -334,7 +334,7 @@ func Test_set_ttytype()
+@@ -369,7 +369,7 @@ func Test_set_ttytype()
    " check for failure of finding the entry and for missing 'cm' entry.
    try
      set ttytype=xxx

vim-8.0.1568-defaults.patch

@@ -1,7 +1,7 @@
-Index: vim-8.1.2233/runtime/defaults.vim
+Index: vim-8.2.0348/runtime/defaults.vim
 ===================================================================
---- vim-8.1.2233.orig/runtime/defaults.vim
+--- vim-8.2.0348.orig/runtime/defaults.vim
-+++ vim-8.1.2233/runtime/defaults.vim
++++ vim-8.2.0348/runtime/defaults.vim
 @@ -77,13 +77,15 @@ inoremap <C-U> <C-G>u<C-U>
  " can position the cursor, Visually select and scroll with the mouse.
  " Only xterm can grab the mouse events when using the shift key, for other

vim-8.1.0297-dump3.patch

@@ -1,8 +1,8 @@
-Index: vim-8.1.2383/src/testdir/test_search.vim
+Index: vim-8.2.0348/src/testdir/test_search.vim
 ===================================================================
---- vim-8.1.2383.orig/src/testdir/test_search.vim
+--- vim-8.2.0348.orig/src/testdir/test_search.vim
-+++ vim-8.1.2383/src/testdir/test_search.vim
++++ vim-8.2.0348/src/testdir/test_search.vim
-@@ -929,7 +929,7 @@ func Test_incsearch_substitute_dump()
+@@ -1012,7 +1012,7 @@ func Test_incsearch_substitute_dump()
  
    " Deleting last slash should remove the match.
    call term_sendkeys(buf, "\<BS>")
@@ -11,7 +11,7 @@ Index: vim-8.1.2383/src/testdir/test_search.vim
    call term_sendkeys(buf, "\<Esc>")
  
    " Reverse range is accepted
-@@ -980,7 +980,7 @@ func Test_incsearch_substitute_dump()
+@@ -1063,7 +1063,7 @@ func Test_incsearch_substitute_dump()
    call term_sendkeys(buf, ":%s/.")
    call VerifyScreenDump(buf, 'Test_incsearch_substitute_11', {})
    call term_sendkeys(buf, "\<BS>")

vim.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Mar 31 14:23:28 UTC 2020 - Ismail Dönmez <idonmez@suse.com>
+
+- Disable more tests failing randomly on OBS:
+    * test_arglist
+    * test_command_count
+    * test_diffmode
+    * test_mksession
+    * test_startup
+    * test_window_cmd
+
 -------------------------------------------------------------------
 Fri Mar 27 08:24:14 UTC 2020 - Ismail Dönmez <idonmez@suse.com>
 

vim.spec

@@ -181,13 +181,19 @@ cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} .
 
 # Unreliable tests
 # See also disable-unreliable-tests.patch
+rm src/testdir/test_arglist.*
+rm src/testdir/test_command_count.*
 rm src/testdir/test_cmdline.*
 rm src/testdir/test_channel.*
-rm src/testdir/gen_opt_test.vim
+rm src/testdir/test_diffmode.*
+rm src/testdir/test_mksession.*
+rm src/testdir/gen_opt_test.*
 rm src/testdir/test_options.*
-rm src/testdir/test_popupwin.vim
+rm src/testdir/test_popupwin.*
+rm src/testdir/test_startup.*
 rm src/testdir/test_terminal*
-rm src/testdir/test_textprop.vim
+rm src/testdir/test_textprop.*
+rm src/testdir/test_window_cmd.*
 rm src/testdir/test_writefile.*
 
 %build

vim73-no-static-libpython.patch

@@ -1,8 +1,8 @@
-Index: vim-8.1.0020/src/configure.ac
+Index: vim-8.2.0348/src/configure.ac
 ===================================================================
---- vim-8.1.0020.orig/src/configure.ac
+--- vim-8.2.0348.orig/src/configure.ac
-+++ vim-8.1.0020/src/configure.ac
++++ vim-8.2.0348/src/configure.ac
-@@ -1252,7 +1252,7 @@ eof
+@@ -1267,7 +1267,7 @@ eof
  		  vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python"
  	      fi
  	    else