# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1663965002 -7200
# Node ID 7ab65e398be7d91db60c42ef86af64f24bc9f403
# Parent  424a31190cb67c8f7d3e7543ed650f6c9a389189
patch 9.0.0564: a few tests keep failing on MacOS M1

Commit: https://github.com/vim/vim/commit/0056ca71374feadf6bad27f5b66eaa18b6f7dad7
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Sep 23 21:26:39 2022 +0100

    patch 9.0.0564: a few tests keep failing on MacOS M1

    Problem:    A few tests keep failing on MacOS M1.
    Solution:   Add a test check CheckNotMacM1.  Fix timer tests.

diff --git a/src/testdir/check.vim b/src/testdir/check.vim
--- 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 M1 system.
+command CheckNotMacM1 call CheckNotMacM1()
+func CheckNotMacM1()
+  if has('mac') && system('uname -a') =~ '\<arm64\>'
+    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/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -2998,6 +2998,8 @@ endfunc
 " Tests for SigUSR1 autocmd event, which is only available on posix systems.
 func Test_autocmd_sigusr1()
   CheckUnix
+  " FIXME: should this work on MacOS M1?
+  CheckNotMacM1
   CheckExecutable /bin/kill
 
   let g:sigusr1_passed = 0
diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
--- a/src/testdir/test_timers.vim
+++ b/src/testdir/test_timers.vim
@@ -129,7 +129,8 @@ func Test_timer_stopall()
   let id1 = timer_start(1000, 'MyHandler')
   let id2 = timer_start(2000, 'MyHandler')
   let info = timer_info()
-  call assert_equal(2, len(info))
+  " count one for the TestTimeout() timer
+  call assert_equal(3, len(info))
 
   call timer_stopall()
   let info = timer_info()
@@ -198,38 +199,47 @@ endfunc
 
 func Test_timer_stop_in_callback()
   let g:test_is_flaky = 1
-  call assert_equal(0, len(timer_info()))
+  call assert_equal(1, len(timer_info()))
   let g:timer1 = timer_start(10, 'StopTimer1')
   let slept = 0
   for i in range(10)
+    if len(timer_info()) == 1
+      break
+    endif
+    sleep 10m
+    let slept += 10
+  endfor
+  if slept == 100
+    call assert_equal(1, len(timer_info()))
+  else
+    " This should take only 30 msec, but on Mac it's often longer
+    call assert_inrange(0, 50, slept)
+  endif
+endfunc
+
+func StopTimerAll(timer)
+  call timer_stopall()
+endfunc
+
+func Test_timer_stop_all_in_callback()
+  let g:test_is_flaky = 1
+  " One timer is for TestTimeout()
+  call assert_equal(1, len(timer_info()))
+  call timer_start(10, 'StopTimerAll')
+  call assert_equal(2, len(timer_info()))
+  let slept = 0
+  for i in range(10)
     if len(timer_info()) == 0
       break
     endif
     sleep 10m
     let slept += 10
   endfor
-  " This should take only 30 msec, but on Mac it's often longer
-  call assert_inrange(0, 50, slept)
-endfunc
-
-func StopTimerAll(timer)
-  call timer_stopall()
-endfunc
-
-func Test_timer_stop_all_in_callback()
-  let g:test_is_flaky = 1
-  call assert_equal(0, len(timer_info()))
-  call timer_start(10, 'StopTimerAll')
-  call assert_equal(1, len(timer_info()))
-  let slept = 0
-  for i in range(10)
-    if len(timer_info()) == 0
-      break
-    endif
-    sleep 10m
-    let slept += 10
-  endfor
-  call assert_inrange(0, 30, slept)
+  if slept == 100
+    call assert_equal(0, len(timer_info()))
+  else
+    call assert_inrange(0, 30, slept)
+  endif
 endfunc
 
 func FeedkeysCb(timer)
@@ -370,6 +380,9 @@ endfunc
 " Test that the garbage collector isn't triggered if a timer callback invokes
 " vgetc().
 func Test_nocatch_timer_garbage_collect()
+  " FIXME: why does this fail only on MacOS M1?
+  CheckNotMacM1
+
   " 'uptimetime. must be bigger than the timer timeout
   set ut=200
   call test_garbagecollect_soon()
diff --git a/src/version.c b/src/version.c
--- 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 */
 /**/
+    564,
+/**/
     563,
 /**/
     562,