To: vim_dev@googlegroups.com Subject: Patch 8.0.1054 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1054 Problem: Terminal test fails on MS-Windows. Solution: Disable the redirection test for now. Improve scrape test to make it less flaky. Files: src/testdir/test_terminal.vim *** ../vim-8.0.1053/src/testdir/test_terminal.vim 2017-09-03 20:59:36.026190759 +0200 --- src/testdir/test_terminal.vim 2017-09-04 22:19:02.301519137 +0200 *************** *** 165,171 **** call term_wait(buf) let g:buf = buf ! call WaitFor('len(term_scrape(g:buf, 1)) > 0') call Check_123(buf) " Must still work after the job ended. --- 165,173 ---- call term_wait(buf) let g:buf = buf ! " On MS-Windows we first get a startup message of two lines, wait for the ! " "cls" to happen, after that we have one line. ! call WaitFor('len(term_scrape(g:buf, 1)) == 1') call Check_123(buf) " Must still work after the job ended. *************** *** 590,601 **** endfunc func Test_terminal_redir_file() ! let cmd = Get_cat_123_cmd() ! let buf = term_start(cmd, {'out_io': 'file', 'out_name': 'Xfile'}) ! call term_wait(buf) ! call WaitFor('len(readfile("Xfile")) > 0') ! call assert_match('123', readfile('Xfile')[0]) ! call delete('Xfile') if has('unix') let buf = term_start('xyzabc', {'err_io': 'file', 'err_name': 'Xfile'}) --- 592,606 ---- endfunc func Test_terminal_redir_file() ! " TODO: this should work on MS-Window ! if has('unix') ! let cmd = Get_cat_123_cmd() ! let buf = term_start(cmd, {'out_io': 'file', 'out_name': 'Xfile'}) ! call term_wait(buf) ! call WaitFor('len(readfile("Xfile")) > 0') ! call assert_match('123', readfile('Xfile')[0]) ! call delete('Xfile') ! endif if has('unix') let buf = term_start('xyzabc', {'err_io': 'file', 'err_name': 'Xfile'}) *** ../vim-8.0.1053/src/version.c 2017-09-04 20:34:15.126492821 +0200 --- src/version.c 2017-09-04 22:20:21.373002807 +0200 *************** *** 771,772 **** --- 771,774 ---- { /* Add new patch number below this line */ + /**/ + 1054, /**/ -- hundred-and-one symptoms of being an internet addict: 79. All of your most erotic dreams have a scrollbar at the right side. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///