Skip to content

Commit 041fc93

Browse files
committed
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.
1 parent 8d524fd commit 041fc93

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

.github/workflows/ci-macvim.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,7 @@ jobs:
380380
- name: Test Vim (GUI)
381381
timeout-minutes: 25
382382
run: |
383+
defaults delete org.vim.MacVim # Clean up stale states left from MacVim tests
383384
make ${MAKE_BUILD_ARGS} -C src/testdir clean
384385
make ${MAKE_BUILD_ARGS} -C src testgui
385386

src/testdir/runtest.vim

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ if has('gui_running')
5858
if has('gui_gtk')
5959
" to keep screendump size unchanged
6060
set guifont=Monospace\ 10
61+
elseif has('gui_macvim')
62+
" keep defaults consistent with other GUIs
63+
set guioptions-=k
6164
endif
6265
set columns=80 lines=25
6366
endif

0 commit comments

Comments
 (0)