To: vim_dev@googlegroups.com Subject: Patch 8.2.1187 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1187 Problem: Terminal2 test sometimes hangs in the GUI on Travis. Solution: Disable Test_zz2_terminal_guioptions_bang() for now. Files: src/testdir/test_terminal2.vim *** ../vim-8.2.1186/src/testdir/test_terminal2.vim 2020-07-11 14:04:25.196182837 +0200 --- src/testdir/test_terminal2.vim 2020-07-12 14:07:19.484454080 +0200 *************** *** 256,290 **** unlet g:job endfunc ! func Test_zz2_terminal_guioptions_bang() ! CheckGui ! set guioptions+=! ! ! let filename = 'Xtestscript' ! if has('win32') ! let filename .= '.bat' ! let prefix = '' ! let contents = ['@echo off', 'exit %1'] ! else ! let filename .= '.sh' ! let prefix = './' ! let contents = ['#!/bin/sh', 'exit $1'] ! endif ! call writefile(contents, filename) ! call setfperm(filename, 'rwxrwx---') ! ! " Check if v:shell_error is equal to the exit status. ! let exitval = 0 ! execute printf(':!%s%s %d', prefix, filename, exitval) ! call assert_equal(exitval, v:shell_error) ! ! let exitval = 9 ! execute printf(':!%s%s %d', prefix, filename, exitval) ! call assert_equal(exitval, v:shell_error) ! ! set guioptions& ! call delete(filename) ! endfunc func Test_terminal_hidden() CheckUnix --- 256,291 ---- unlet g:job endfunc ! " TODO: reenable when this no longer hangs on Travis ! "func Test_zz2_terminal_guioptions_bang() ! " CheckGui ! " set guioptions+=! ! " ! " let filename = 'Xtestscript' ! " if has('win32') ! " let filename .= '.bat' ! " let prefix = '' ! " let contents = ['@echo off', 'exit %1'] ! " else ! " let filename .= '.sh' ! " let prefix = './' ! " let contents = ['#!/bin/sh', 'exit $1'] ! " endif ! " call writefile(contents, filename) ! " call setfperm(filename, 'rwxrwx---') ! " ! " " Check if v:shell_error is equal to the exit status. ! " let exitval = 0 ! " execute printf(':!%s%s %d', prefix, filename, exitval) ! " call assert_equal(exitval, v:shell_error) ! " ! " let exitval = 9 ! " execute printf(':!%s%s %d', prefix, filename, exitval) ! " call assert_equal(exitval, v:shell_error) ! " ! " set guioptions& ! " call delete(filename) ! "endfunc func Test_terminal_hidden() CheckUnix *************** *** 305,310 **** --- 306,316 ---- term let bnr = bufnr('$') call WaitForAssert({-> assert_equal('running', term_getstatus(bnr))}) + " In the GUI the first switch sometimes doesn't work. Switch twice to avoid + " flakyness. + call feedkeys("\N", 'xt') + call feedkeys("A", 'xt') + call WaitForAssert({-> assert_equal('running', term_getstatus(bnr))}) call feedkeys("\N", 'xt') call WaitForAssert({-> assert_equal('running,normal', term_getstatus(bnr))}) call feedkeys("A", 'xt') *** ../vim-8.2.1186/src/version.c 2020-07-12 13:47:38.808013098 +0200 --- src/version.c 2020-07-12 14:08:32.304234889 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1187, /**/ -- hundred-and-one symptoms of being an internet addict: 11. You find yourself typing "com" after every period when using a word processor.com /// 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 ///