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.

diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
index 98df6ff9370f95ebefde2c0d403bef1d0316da62..f97808c1576829a353dad86a82fc6f88a9c08dc4 100644 (file)
--- 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

diff --git a/src/version.c b/src/version.c
index 44286871224616d7157c4e83c4a859acc976f264..5057877b991c71034d813518d6ae2b0a236e1a17 100644 (file)
--- 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 */
+/**/
+    574,
 /**/
     573,
 /**/