From 7f58b2bb6a1a667689d450d9e9738d68a91f0518 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Fri, 29 Sep 2023 06:06:28 +0800 Subject: [PATCH] vim-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. https://github.com/vim/vim/commit/f802767df7b4532651fcf11d49e812ead32db45b Co-authored-by: Bram Moolenaar --- test/old/testdir/check.vim | 16 ++++++++++++++++ test/old/testdir/test_messages.vim | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/test/old/testdir/check.vim b/test/old/testdir/check.vim index af1a80250c..647e25b214 100644 --- a/test/old/testdir/check.vim +++ b/test/old/testdir/check.vim @@ -108,6 +108,22 @@ 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() + if has('mac') && system('uname -a') =~ '\' + throw 'Skipped: does not work on MacOS M1' + endif +endfunc + " Command to check that making screendumps is supported. " Caller must source screendump.vim command CheckScreendump call CheckScreendump() diff --git a/test/old/testdir/test_messages.vim b/test/old/testdir/test_messages.vim index adafb6bd23..9a999d71a8 100644 --- a/test/old/testdir/test_messages.vim +++ b/test/old/testdir/test_messages.vim @@ -379,7 +379,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')\")