diff options
| -rw-r--r-- | .github/workflows/test.yml | 19 | ||||
| -rw-r--r-- | test/functional/autocmd/termxx_spec.lua | 1 | ||||
| -rw-r--r-- | test/functional/ex_cmds/mksession_spec.lua | 2 | ||||
| -rw-r--r-- | test/functional/ui/output_spec.lua | 1 | ||||
| -rw-r--r-- | test/old/testdir/runnvim.vim | 6 |
5 files changed, 20 insertions, 9 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e6ff09d351..5e6f05d973 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -288,7 +288,7 @@ jobs: run: cmake --build build --config MinSizeRel windows: - runs-on: windows-2019 + runs-on: windows-2022 timeout-minutes: 45 name: windows steps: @@ -348,14 +348,19 @@ jobs: run: cmake --build build --target functionaltest - if: success() || failure() && steps.abort_job.outputs.status == 'success' + uses: msys2/setup-msys2@v2 + with: + update: true + pacboy: >- + make:p gcc:p + release: false + + - if: success() || failure() && steps.abort_job.outputs.status == 'success' name: Run oldtest + shell: msys2 {0} run: | - # Add MSYS to path, required for e.g. `find` used in test scripts. - # But would break functionaltest, where its `more` would be used then. - $OldPath = $env:PATH - $env:PATH = "C:\msys64\usr\bin;$env:PATH" - & "C:\msys64\mingw64\bin\mingw32-make.exe" -C $(Convert-Path test\old\testdir) VERBOSE=1 - $env:PATH = $OldPath + cd test/old/testdir + mingw32-make VERBOSE=1 with-external-deps: runs-on: ubuntu-22.04 diff --git a/test/functional/autocmd/termxx_spec.lua b/test/functional/autocmd/termxx_spec.lua index 63b5617eef..a9980dda04 100644 --- a/test/functional/autocmd/termxx_spec.lua +++ b/test/functional/autocmd/termxx_spec.lua @@ -50,6 +50,7 @@ describe('autocmd TermClose', function() end) it('triggers when long-running terminal job gets stopped', function() + skip(is_os('win')) nvim('set_option', 'shell', is_os('win') and 'cmd.exe' or 'sh') command('autocmd TermClose * let g:test_termclose = 23') command('terminal') diff --git a/test/functional/ex_cmds/mksession_spec.lua b/test/functional/ex_cmds/mksession_spec.lua index 0a0c7ca410..0a1cdd93aa 100644 --- a/test/functional/ex_cmds/mksession_spec.lua +++ b/test/functional/ex_cmds/mksession_spec.lua @@ -18,6 +18,8 @@ local is_os = helpers.is_os local file_prefix = 'Xtest-functional-ex_cmds-mksession_spec' +if helpers.skip(helpers.is_os('win')) then return end + describe(':mksession', function() local session_file = file_prefix .. '.vim' local tab_dir = file_prefix .. '.d' diff --git a/test/functional/ui/output_spec.lua b/test/functional/ui/output_spec.lua index 223844405e..954431d689 100644 --- a/test/functional/ui/output_spec.lua +++ b/test/functional/ui/output_spec.lua @@ -54,6 +54,7 @@ describe("shell command :!", function() it("throttles shell-command output greater than ~10KB", function() skip(is_os('openbsd'), 'FIXME #10804') + skip(is_os('win')) child_session.feed_data((":!%s REP 30001 foo\n"):format(testprg('shell-test'))) -- If we observe any line starting with a dot, then throttling occurred. diff --git a/test/old/testdir/runnvim.vim b/test/old/testdir/runnvim.vim index a46e2d3fc0..2db60d05b3 100644 --- a/test/old/testdir/runnvim.vim +++ b/test/old/testdir/runnvim.vim @@ -23,11 +23,13 @@ function Main() set lines=25 set columns=80 enew - let job = termopen(args, s:logger) + " FIXME: using termopen() hangs on Windows CI + let job = has('win32') ? jobstart(args, s:logger) : termopen(args, s:logger) let results = jobwait([job], 5 * 60 * 1000) " TODO(ZyX-I): Get colors let screen = getline(1, '$') - bwipeout! " kills the job always. + call jobstop(job) " kills the job always. + bwipeout! let stringified_events = map(s:logger.d_events, \'v:val[0] . ": " . ' . \'join(map(v:val[1], '. |