Mercurial > vim
changeset 34259:70c1a9c6f41d v9.1.0070
patch 9.1.0070: CI: testsuite not run on M1 Mac
Commit: https://github.com/vim/vim/commit/e93d5cadec6323d6be90f1ec29066441ffbc9477
Author: rhysd <lin90162@yahoo.co.jp>
Date: Thu Feb 1 21:22:14 2024 +0100
patch 9.1.0070: CI: testsuite not run on M1 Mac
Problem: CI: testsuite not run on M1 Mac
Solution: Make it run on gh runners for M1, disable failing tests for
now, until we figure the problem with the failings tests out
(rhysd)
closes: #13943
Signed-off-by: rhysd <lin90162@yahoo.co.jp>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 01 Feb 2024 21:30:03 +0100 |
| parents | 1ee0053193b6 |
| children | 4b26e370dca0 |
| files | .github/workflows/ci.yml src/testdir/test_diffmode.vim src/testdir/test_sound.vim src/testdir/test_terminal2.vim src/version.c |
| diffstat | 5 files changed, 27 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -299,7 +299,7 @@ jobs: done macos: - runs-on: macos-latest + runs-on: ${{ matrix.runner }} env: CC: clang @@ -312,17 +312,24 @@ jobs: fail-fast: false matrix: features: [tiny, normal, huge] + runner: [macos-latest, macos-14] steps: - name: Checkout repository from github uses: actions/checkout@v4 - - name: Install packages - if: matrix.features == 'huge' + - name: Install packages on Intel Mac + if: matrix.features == 'huge' && matrix.runner == 'macos-latest' run: | brew install lua echo "LUA_PREFIX=/usr/local" >> $GITHUB_ENV + - name: Install packages on M1 Mac + if: matrix.features == 'huge' && matrix.runner == 'macos-14' + run: | + brew install lua libtool + echo "LUA_PREFIX=/opt/homebrew" >> $GITHUB_ENV + - name: Set up environment run: | (
--- a/src/testdir/test_diffmode.vim +++ b/src/testdir/test_diffmode.vim @@ -871,6 +871,10 @@ func VerifyInternal(buf, dumpfile, extra endfunc func Test_diff_screen() + if has('osx') && !empty($CI) && system('uname -m') =~# 'arm64' + throw 'Skipped: FIXME: This test fails on M1 Mac on GitHub Actions' + endif + let g:test_is_flaky = 1 CheckScreendump CheckFeature menu
--- a/src/testdir/test_sound.vim +++ b/src/testdir/test_sound.vim @@ -15,6 +15,9 @@ func Test_play_event() if has('win32') throw 'Skipped: Playing event with callback is not supported on Windows' endif + if has('osx') && !empty($CI) && system('uname -m') =~# 'arm64' + throw 'Skipped: FIXME: Running this test on M1 Mac hangs on GitHub Actions' + endif let g:playcallback_count = 0 let g:id = 0 let event_name = 'bell' @@ -35,6 +38,10 @@ func Test_play_event() endfunc func Test_play_silent() + if has('osx') && !empty($CI) && system('uname -m') =~# 'arm64' + throw 'Skipped: FIXME: Running this test on M1 Mac hangs on GitHub Actions' + endif + let fname = fnamemodify('silent.wav', '%p') let g:playcallback_count = 0
--- a/src/testdir/test_terminal2.vim +++ b/src/testdir/test_terminal2.vim @@ -536,6 +536,10 @@ endfunc " Test for term_gettitle() func Test_term_gettitle() + if has('osx') && !empty($CI) && system('uname -m') =~# 'arm64' + throw 'Skipped: FIXME: Title got on M1 Mac is broken on GitHub Actions' + endif + " term_gettitle() returns an empty string for a non-terminal buffer " and for a non-existing buffer. call assert_equal('', bufnr('%')->term_gettitle())