To: vim_dev@googlegroups.com Subject: Patch 8.2.0447 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0447 Problem: Terminal scroll tests fails on some systems. Solution: Remove the fixed 100msec wait for Win32. Add a loop to wait until scrolling has finished. (James McCoy, closes #5842) Files: src/testdir/test_terminal.vim *** ../vim-8.2.0446/src/testdir/test_terminal.vim 2020-03-24 12:12:26.690758411 +0100 --- src/testdir/test_terminal.vim 2020-03-25 21:24:22.754881474 +0100 *************** *** 298,310 **** let job = term_getjob(buf) call WaitForAssert({-> assert_equal("dead", job_status(job))}) call term_wait(buf) - if has('win32') - " TODO: this should not be needed - sleep 100m - endif ! let scrolled = buf->term_getscrolled() ! call assert_equal(scrolled, term_getscrolled(buf)) call assert_equal('1', getline(1)) call assert_equal('1', term_getline(buf, 1 - scrolled)) call assert_equal('49', getline(49)) --- 298,313 ---- let job = term_getjob(buf) call WaitForAssert({-> assert_equal("dead", job_status(job))}) call term_wait(buf) ! " wait until the scrolling stops ! while 1 ! let scrolled = buf->term_getscrolled() ! sleep 20m ! if scrolled == buf->term_getscrolled() ! break ! endif ! endwhile ! call assert_equal('1', getline(1)) call assert_equal('1', term_getline(buf, 1 - scrolled)) call assert_equal('49', getline(49)) *** ../vim-8.2.0446/src/version.c 2020-03-25 21:13:42.356409331 +0100 --- src/version.c 2020-03-25 21:26:39.954499062 +0100 *************** *** 740,741 **** --- 740,743 ---- { /* Add new patch number below this line */ + /**/ + 447, /**/ -- There are 2 kinds of people in my world: those who know Unix, Perl, Vim, GNU, Linux, etc, and those who know COBOL. It gets very difficult for me at parties, not knowing which group to socialise with :-) Sitaram Chamarty /// 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 ///