summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-09-27 15:55:43 +0100
committerBram Moolenaar <Bram@vim.org>2022-09-27 15:55:43 +0100
commitf802767df7b4532651fcf11d49e812ead32db45b (patch)
treeabd877478e97ff3d88eab3ffa1c797a5cf8899bd
parent524c853e5ef0392fcf28e449946e05e7e3046e67 (diff)
downloadvim-git-f802767df7b4532651fcf11d49e812ead32db45b.tar.gz
patch 9.0.0607: verbose echo message test fails on Mac OSv9.0.0607
Problem: Verbose echo message test fails on Mac OS. Solution: Skip the test on Mac OS.
-rw-r--r--src/testdir/check.vim8
-rw-r--r--src/testdir/test_messages.vim3
-rw-r--r--src/version.c2
3 files changed, 12 insertions, 1 deletions
diff --git a/src/testdir/check.vim b/src/testdir/check.vim
index c3f256389..82abb6467 100644
--- a/src/testdir/check.vim
+++ b/src/testdir/check.vim
@@ -111,6 +111,14 @@ func CheckNotBSD()
endif
endfunc
+" Command to check for not running on a MacOS
+command CheckNotMac call CheckNotMac()
+func CheckNotMac()
+ if has('mac')
+ throw 'Skipped: does not work on MacOS'
+ endif
+endfunc
+
" Command to check for not running on a MacOS M1 system.
command CheckNotMacM1 call CheckNotMacM1()
func CheckNotMacM1()
diff --git a/src/testdir/test_messages.vim b/src/testdir/test_messages.vim
index 486adcb2d..2cfe92c6e 100644
--- a/src/testdir/test_messages.vim
+++ b/src/testdir/test_messages.vim
@@ -339,7 +339,8 @@ endfunc
" Test verbose message before echo command
func Test_echo_verbose_system()
CheckRunVimInTerminal
- CheckUnix
+ CheckUnix " needs the "seq" command
+ CheckNotMac " doesn't use /tmp
let buf = RunVimInTerminal('', {'rows': 10})
call term_sendkeys(buf, ":4 verbose echo system('seq 20')\<CR>")
diff --git a/src/version.c b/src/version.c
index 5a4cb9f38..8e438af3c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 607,
+/**/
606,
/**/
605,