Mercurial > vim

changeset 30477:5e99ae766688 v9.0.0574

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.0574: timer garbage collect test hangs on Mac M1 Commit: https://github.com/vim/vim/commit/140f6d0eda7921f2f0b057ec38ed501240903fc3 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Sep 24 14:49:07 2022 +0100 patch 9.0.0574: timer garbage collect test hangs on Mac M1 Problem: Timer garbage collect test hangs on Mac M1. Solution: Properly check for Mac M1 and skip the test.
author Bram Moolenaar <Bram@vim.org>
date Sat, 24 Sep 2022 16:00:03 +0200
parents 7a70fd4e6c5f
children ecb85ad746ff
files src/testdir/test_timers.vim src/version.c
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_timers.vim
+++ b/src/testdir/test_timers.vim
@@ -381,7 +381,12 @@ endfunc
 " vgetc().
 func Test_nocatch_timer_garbage_collect()
   " FIXME: why does this fail only on MacOS M1?
-  CheckNotMacM1
+  try 
+    CheckNotMacM1
+  catch /Skipped/
+    let g:skipped_reason = v:exception
+    return
+  endtry
 
   " 'uptimetime. must be bigger than the timer timeout
   set ut=200
--- 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 */
 /**/
+    574,
+/**/
     573,
 /**/
     572,