From f802767df7b4532651fcf11d49e812ead32db45b Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 27 Sep 2022 15:55:43 +0100 Subject: [PATCH] patch 9.0.0607: verbose echo message test fails on Mac OS Problem: Verbose echo message test fails on Mac OS. Solution: Skip the test on Mac OS. --- src/testdir/check.vim | 8 ++++++++ src/testdir/test_messages.vim | 3 ++- src/version.c | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/testdir/check.vim b/src/testdir/check.vim index c3f2563898..82abb64673 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 486adcb2de..2cfe92c6e6 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')\") diff --git a/src/version.c b/src/version.c index 5a4cb9f380..8e438af3c8 100644 --- a/src/version.c +++ b/src/version.c @@ -699,6 +699,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 607, /**/ 606, /**/