diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-09-24 14:49:07 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-09-24 14:49:07 +0100 |
| commit | 140f6d0eda7921f2f0b057ec38ed501240903fc3 (patch) | |
| tree | 4b0e5f7f68c395e8fbe96fe1a1e870f97b80c55d | |
| parent | 81fd3b2b4438e2751a1b79049827a5ee315ea38d (diff) | |
| download | vim-git-9.0.0574.tar.gz | |
patch 9.0.0574: timer garbage collect test hangs on Mac M1v9.0.0574
Problem: Timer garbage collect test hangs on Mac M1.
Solution: Properly check for Mac M1 and skip the test.
| -rw-r--r-- | src/testdir/test_timers.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim index 98df6ff93..f97808c15 100644 --- 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 442868712..5057877b9 100644 --- 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, |