From 041fc932ba1a19a80f7987fbcf65b6578e096548 Mon Sep 17 00:00:00 2001 From: Yee Cheng Chin Date: Sun, 19 Jan 2025 16:03:03 -0800 Subject: [PATCH] ci: Don't use guioptions-k in Vim tests, clean up defaults for gui tests This keeps it consistent with other Vim GUIs and prevent unintentional breakages, since we have enabled guioptions-k as default now in MacVim which isn't the case for other platforms. Also, since MacVim tests are run before Vim GUI tests, there's a possibility that there are stale auto-saved states leftover that interferes with them. Usually they should not matter, but we clean them up anyway to make sure we have a consistent state to run tests from. --- .github/workflows/ci-macvim.yaml | 1 + src/testdir/runtest.vim | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/ci-macvim.yaml b/.github/workflows/ci-macvim.yaml index 4e2c103632..422a824851 100644 --- a/.github/workflows/ci-macvim.yaml +++ b/.github/workflows/ci-macvim.yaml @@ -380,6 +380,7 @@ jobs: - name: Test Vim (GUI) timeout-minutes: 25 run: | + defaults delete org.vim.MacVim # Clean up stale states left from MacVim tests make ${MAKE_BUILD_ARGS} -C src/testdir clean make ${MAKE_BUILD_ARGS} -C src testgui diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index 0a2c792137..fdc97658a1 100644 --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -58,6 +58,9 @@ if has('gui_running') if has('gui_gtk') " to keep screendump size unchanged set guifont=Monospace\ 10 + elseif has('gui_macvim') + " keep defaults consistent with other GUIs + set guioptions-=k endif set columns=80 lines=25 endif