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 2700b7a915f92069c50c3d907ce3947ec3c28be2..e2eac5394f6ced7aa0e35017d7181c736728fbbb 100644 (file)
--- 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 9373f605bd1ca847eeacc78b4434601ab21381d6..f00f8057a8f39ecbcce60550c026394f5ef58adc 100644 (file)
--- 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,
 /**/