From: Bram Moolenaar Date: Tue, 14 Jun 2022 14:00:28 +0000 (+0100) Subject: patch 8.2.5091: terminal test fails with some shell commands X-Git-Tag: v8.2.5091 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e564c7009dfb065fb5261e548b15f83d32f735c9;p=thirdparty%2Fvim.git patch 8.2.5091: terminal test fails with some shell commands Problem: Terminal test fails with some shell commands. Solution: Disable setting the window title. (closes #10530) --- diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index 2700b7a915..e2eac5394f 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -1218,6 +1218,9 @@ endfunc " argument, check that :confirm qall works. func Test_terminal_qall_prompt() CheckRunVimInTerminal + + " the shell may set the window title, we don't want that here + call test_override('vterm_title', 1) let buf = RunVimInTerminal('', {}) " Open a terminal window and wait for the prompt to appear @@ -1233,6 +1236,7 @@ func Test_terminal_qall_prompt() " close the terminal window where Vim was running quit + call test_override('ALL', 0) endfunc " Run Vim in a terminal, then start a terminal window with a shell and check diff --git a/src/version.c b/src/version.c index 9373f605bd..f00f8057a8 100644 --- a/src/version.c +++ b/src/version.c @@ -734,6 +734,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 5091, /**/ 5090, /**/