# HG changeset patch # User Christian Brabandt # Date 1509636607 -3600 # Node ID 75abce3e933d2bd46e0859950dc6d60d9d46dd20 # Parent ea9796ba34d1a273a65006be2f28fb293f1a346c patch 8.0.1244: search test does not work correctly on MS-Windows commit https://github.com/vim/vim/commit/b94340c04f524482b408543daa1142f883831cab Author: Bram Moolenaar Date: Thu Nov 2 16:16:31 2017 +0100 patch 8.0.1244: search test does not work correctly on MS-Windows Problem: Search test does not work correctly on MS-Windows. Solution: Put text in a file instead of sending it to the terminal. (Christian Brabandt) diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim --- a/src/testdir/test_search.vim +++ b/src/testdir/test_search.vim @@ -494,13 +494,15 @@ func Test_search_cmdline_incsearch_highl if h < 3 return endif - let g:buf = term_start([GetVimProg(), '--clean', '-c', 'set noswapfile'], {'term_rows': 3}) " Prepare buffer text - let lines = ['abb vim vim vi', 'vimvivim'] - call term_sendkeys(g:buf, 'i' . join(lines, "\n") . "\gg0") - call term_wait(g:buf, 200) - call assert_equal(lines[0], term_getline(g:buf, 1)) + 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)) + unlet g:lines " Get attr of normal(a0), incsearch(a1), hlsearch(a2) highlight call term_sendkeys(g:buf, ":set incsearch hlsearch\") @@ -565,6 +567,7 @@ func Test_search_cmdline_incsearch_highl call assert_equal(attr_line1, map(term_scrape(g:buf, 1)[:len(attr_line1)-1], 'v:val.attr')) call assert_equal(attr_line2, map(term_scrape(g:buf, 2)[:len(attr_line2)-1], 'v:val.attr')) + call delete('Xsearch.txt') bwipe! endfunc diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1244, +/**/ 1243, /**/ 1242,