[vim] 01/03: Add patch to fix flakiness in test_search.vim
James McCoy
jamessan at debian.org
Sat Nov 4 04:52:04 UTC 2017
This is an automated email from the git hooks/post-receive script.
jamessan pushed a commit to branch debian/sid
in repository vim.
commit f767caa308be0cfa97e09d89116c6b72f4599628
Author: James McCoy <jamessan at debian.org>
Date: Fri Nov 3 20:50:11 2017 -0400
Add patch to fix flakiness in test_search.vim
Signed-off-by: James McCoy <jamessan at debian.org>
---
debian/changelog | 6 +++
...of-more-LaTeX-commands-for-tex-filetype-d.patch | 4 +-
...t-filetype-using-the-contents-of-the-file.patch | 2 +-
...s-decision-to-disable-modelines-by-defaul.patch | 4 +-
...ng-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch | 12 +++---
debian/patches/series | 1 +
...ing-compilation-date-in-SOURCE_DATE_EPOCH.patch | 6 +--
...test_search-WaitFor-g-lines-to-be-visible.patch | 45 ++++++++++++++++++++++
8 files changed, 66 insertions(+), 14 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 948cc8c..ce03ba9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vim (2:8.0.1257-2) UNRELEASED; urgency=medium
+
+ * Add patch to fix flakiness in test_search.vim
+
+ -- James McCoy <jamessan at debian.org> Fri, 03 Nov 2017 20:35:50 -0400
+
vim (2:8.0.1257-1) unstable; urgency=medium
[ upstream ]
diff --git a/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch b/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
index c008e27..d28c344 100644
--- a/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
+++ b/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
@@ -13,10 +13,10 @@ Signed-off-by: James McCoy <jamessan at debian.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
-index de00f23..b45da2b 100644
+index 328f8da..517d00a 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
-@@ -2280,7 +2280,7 @@ func! s:FTtex()
+@@ -2286,7 +2286,7 @@ func! s:FTtex()
call cursor(1,1)
let firstNC = search('^\s*[^[:space:]%]', 'c', 1000)
if firstNC " Check the next thousand lines for a LaTeX or ConTeXt keyword.
diff --git a/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch b/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
index 5fcb5f9..68945d5 100644
--- a/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
+++ b/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
@@ -8,7 +8,7 @@ Closes: #382541
1 file changed, 8 insertions(+)
diff --git a/runtime/scripts.vim b/runtime/scripts.vim
-index 9107d6a..628ac01 100644
+index e4362c8..48a5524 100644
--- a/runtime/scripts.vim
+++ b/runtime/scripts.vim
@@ -348,6 +348,14 @@ else
diff --git a/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch b/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
index 2ad41dc..df7dac3 100644
--- a/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
+++ b/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
@@ -15,10 +15,10 @@ Signed-off-by: James McCoy <jamessan at debian.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
-index ebe9c92..af5368b 100644
+index 2027a4b..a9104b2 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
-@@ -5256,7 +5256,7 @@ A jump table for the options with a short description can be found at |Q_op|.
+@@ -5266,7 +5266,7 @@ A jump table for the options with a short description can be found at |Q_op|.
*'modeline'* *'ml'* *'nomodeline'* *'noml'*
'modeline' 'ml' boolean (Vim default: on (off for root),
diff --git a/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch b/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
index 2aea7a0..403749c 100644
--- a/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
+++ b/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
@@ -17,10 +17,10 @@ Signed-off-by: James Vega <jamessan at debian.org>
3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/src/main.c b/src/main.c
-index 0283231..a8ffa9d 100644
+index 97f1b03..ff5e05b 100644
--- a/src/main.c
+++ b/src/main.c
-@@ -1778,6 +1778,10 @@ parse_command_name(mparm_T *parmp)
+@@ -1771,6 +1771,10 @@ parse_command_name(mparm_T *parmp)
}
else if (STRNICMP(initstr, "vim", 3) == 0)
initstr += 3;
@@ -31,7 +31,7 @@ index 0283231..a8ffa9d 100644
/* Catch "[r][g]vimdiff" and "[r][g]viewdiff". */
if (STRICMP(initstr, "diff") == 0)
-@@ -3028,7 +3032,12 @@ source_startup_scripts(mparm_T *parmp)
+@@ -3021,7 +3025,12 @@ source_startup_scripts(mparm_T *parmp)
* Get system wide defaults, if the file name is defined.
*/
#ifdef SYS_VIMRC_FILE
@@ -45,7 +45,7 @@ index 0283231..a8ffa9d 100644
#endif
#ifdef MACOS_X
(void)do_source((char_u *)"$VIMRUNTIME/macmap.vim", FALSE, DOSO_NONE);
-@@ -3063,6 +3072,9 @@ source_startup_scripts(mparm_T *parmp)
+@@ -3056,6 +3065,9 @@ source_startup_scripts(mparm_T *parmp)
&& do_source((char_u *)USR_EXRC_FILE, FALSE, DOSO_NONE) == FAIL
#ifdef USR_EXRC_FILE2
&& do_source((char_u *)USR_EXRC_FILE2, FALSE, DOSO_NONE) == FAIL
@@ -70,10 +70,10 @@ index 695affa..b6e7e59 100644
# define SYS_VIMRC_FILE "$VIM/vimrc"
#endif
diff --git a/src/structs.h b/src/structs.h
-index 7b0f70c..37043e4 100644
+index 774104c..6b49537 100644
--- a/src/structs.h
+++ b/src/structs.h
-@@ -3359,6 +3359,9 @@ typedef struct
+@@ -3352,6 +3352,9 @@ typedef struct
#ifdef FEAT_DIFF
int diff_mode; /* start with 'diff' set */
#endif
diff --git a/debian/patches/series b/debian/patches/series
index 43cc665..dd6a5c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
upstream/syntax-debcontrol.vim-Sync-up-with-deb-src-control-5.patch
upstream/syntax-deb-source-changelog-.vim-Update-release-names.patch
+upstream/test_search-WaitFor-g-lines-to-be-visible.patch
diff --git a/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch b/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch
index 5cebdcf..220539c 100644
--- a/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch
+++ b/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch
@@ -23,7 +23,7 @@ preprocessor's __DATE__/__TIME__ symbols will be used.
3 files changed, 19 insertions(+)
diff --git a/src/config.h.in b/src/config.h.in
-index fe68d49..7e6e504 100644
+index e692d40..d3aa1a2 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -30,6 +30,9 @@
@@ -37,7 +37,7 @@ index fe68d49..7e6e504 100644
#undef HAVE_ATTRIBUTE_UNUSED
diff --git a/src/configure.ac b/src/configure.ac
-index f465096..0eae4c0 100644
+index e287124..5a16797 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -29,6 +29,16 @@ dnl in autoconf needs it, where it uses STDC_HEADERS.
@@ -58,7 +58,7 @@ index f465096..0eae4c0 100644
AC_MSG_CHECKING(--enable-fail-if-missing argument)
diff --git a/src/version.c b/src/version.c
-index 71569b3..a0fb0f3 100644
+index 65f5a4b..9422657 100644
--- a/src/version.c
+++ b/src/version.c
@@ -44,11 +44,17 @@ make_version(void)
diff --git a/debian/patches/upstream/test_search-WaitFor-g-lines-to-be-visible.patch b/debian/patches/upstream/test_search-WaitFor-g-lines-to-be-visible.patch
new file mode 100644
index 0000000..90354ac
--- /dev/null
+++ b/debian/patches/upstream/test_search-WaitFor-g-lines-to-be-visible.patch
@@ -0,0 +1,45 @@
+From: James McCoy <jamessan at debian.org>
+Date: Fri, 3 Nov 2017 19:42:16 -0400
+Subject: test_search: WaitFor g:lines to be visible
+
+On slower systems, the arbitrary wait isn't long enough. Waiting for
+the desired behavior is more reliable.
+
+Signed-off-by: James McCoy <jamessan at debian.org>
+---
+ src/testdir/test_search.vim | 13 +++++--------
+ 1 file changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim
+index 37661c3..a93ab05 100644
+--- a/src/testdir/test_search.vim
++++ b/src/testdir/test_search.vim
+@@ -480,13 +480,12 @@ func Test_search_cmdline8()
+ return
+ endif
+ " Prepare buffer text
+- let lines = ['abb vim vim vi', 'vimvivim']
+- call writefile(lines, 'Xsearch.txt')
++ let g:lines = ['abb vim vim vi', 'vimvivim']
++ call writefile(g:lines, 'Xsearch.txt')
+ let g:buf = term_start([GetVimProg(), '--clean', '-c', 'set noswapfile', 'Xsearch.txt'], {'term_rows': 3})
+
+- call term_wait(g:buf, 200)
+- call assert_equal(lines[0], term_getline(g:buf, 1))
+- call assert_equal(lines[1], term_getline(g:buf, 2))
++ call WaitFor('g:lines == [term_getline(g:buf, 1), term_getline(g:buf, 2)]')
++ unlet g:lines
+
+ call term_sendkeys(g:buf, ":set incsearch hlsearch\<cr>")
+ call term_sendkeys(g:buf, ":14vsp\<cr>")
+@@ -610,9 +609,7 @@ func Test_search_cmdline_incsearch_highlight_attr()
+ let g:lines = ['abb vim vim vi', 'vimvivim']
+ call writefile(g:lines, 'Xsearch.txt')
+ let g:buf = term_start([GetVimProg(), '--clean', '-c', 'set noswapfile', 'Xsearch.txt'], {'term_rows': 3})
+- call WaitFor('g:lines[0] == term_getline(g:buf, 1)')
+- call assert_equal(g:lines[0], term_getline(g:buf, 1))
+- call assert_equal(g:lines[1], term_getline(g:buf, 2))
++ call WaitFor('g:lines == [term_getline(g:buf, 1), term_getline(g:buf, 2)]')
+ unlet g:lines
+
+ " Get attr of normal(a0), incsearch(a1), hlsearch(a2) highlight
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git
More information about the pkg-vim-maintainers
mailing list