Skip to content

Commit 40e9572

Browse files
authored
1 parent 8d4711c commit 40e9572

1 file changed

Lines changed: 33 additions & 43 deletions

File tree

.github/workflows/build-vim.yml

Lines changed: 33 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -687,54 +687,44 @@ jobs:
687687
# run: |
688688
# ping -n 3600 localhost>nul
689689

690-
- name: Test gvim/vim and show the result of gvim tests
691-
shell: cmd
692-
timeout-minutes: 30
693-
run: |
694-
path %LUA_DIR%;%PERL_DIR%\bin;%PYTHON3_DIR%;%PYTHON2_DIR%;%RUBY_DIR%\bin;%RUBY_DIR%\bin\ruby_builtin_dlls;%GETTEXT_DIR%;%RACKET_DIR%;%RACKET_DIR%\lib;%path%
695-
set "PLTCOLLECTS=%RACKET_DIR%\collects"
696-
set "PLTCONFIGDIR=%RACKET_DIR%\etc"
690+
- parallel:
691+
# Run gvim tests and vim tests in parallel
692+
693+
- name: Test gvim
694+
shell: cmd
695+
timeout-minutes: 30
696+
run: |
697+
path %LUA_DIR%;%PERL_DIR%\bin;%PYTHON3_DIR%;%PYTHON2_DIR%;%RUBY_DIR%\bin;%RUBY_DIR%\bin\ruby_builtin_dlls;%GETTEXT_DIR%;%RACKET_DIR%;%RACKET_DIR%\lib;%path%
698+
set "PLTCOLLECTS=%RACKET_DIR%\collects"
699+
set "PLTCONFIGDIR=%RACKET_DIR%\etc"
700+
701+
if "${{ matrix.arch }}"=="arm64" (
702+
set "TEST_SKIP_PAT=%TEST_SKIP_PAT_ARM64%"
703+
)
697704
698-
if "${{ matrix.arch }}"=="arm64" (
699-
set "TEST_SKIP_PAT=%TEST_SKIP_PAT_ARM64%"
700-
)
705+
call vim\src\msvc-latest ${{ matrix.vcarch }}
701706
702-
call vim\src\msvc-latest ${{ matrix.vcarch }}
703-
cd vim
707+
echo %COL_GREEN%Test gvim:%COL_RESET%
708+
cd vim\src\testdir
709+
nmake -nologo -f Make_mvc.mak VIMPROG=..\gvim || exit 1
704710
705-
echo %COL_GREEN%Start testing vim in background.%COL_RESET%
706-
start cmd /c "cd src2\testdir & nmake -nologo -f Make_mvc.mak VIMPROG=..\..\src\vim > nul & echo done>done.txt"
711+
- name: Test vim
712+
shell: cmd
713+
timeout-minutes: 30
714+
run: |
715+
path %LUA_DIR%;%PERL_DIR%\bin;%PYTHON3_DIR%;%PYTHON2_DIR%;%RUBY_DIR%\bin;%RUBY_DIR%\bin\ruby_builtin_dlls;%GETTEXT_DIR%;%RACKET_DIR%;%RACKET_DIR%\lib;%path%
716+
set "PLTCOLLECTS=%RACKET_DIR%\collects"
717+
set "PLTCONFIGDIR=%RACKET_DIR%\etc"
707718
708-
echo %COL_GREEN%Test gvim:%COL_RESET%
709-
cd src\testdir
710-
nmake -nologo -f Make_mvc.mak VIMPROG=..\gvim || exit 1
711-
cd ..
719+
if "${{ matrix.arch }}"=="arm64" (
720+
set "TEST_SKIP_PAT=%TEST_SKIP_PAT_ARM64%"
721+
)
712722
713-
- name: Show the result of vim tests
714-
shell: cmd
715-
timeout-minutes: 10
716-
run: |
717-
path %LUA_DIR%;%PERL_DIR%\bin;%PYTHON3_DIR%;%PYTHON2_DIR%;%RUBY_DIR%\bin;%RUBY_DIR%\bin\ruby_builtin_dlls;%GETTEXT_DIR%;%RACKET_DIR%;%RACKET_DIR%\lib;%path%
718-
set "PLTCOLLECTS=%RACKET_DIR%\collects"
719-
set "PLTCONFIGDIR=%RACKET_DIR%\etc"
720-
call vim\src\msvc-latest ${{ matrix.vcarch }}
721-
echo %COL_GREEN%Wait for vim tests to finish.%COL_RESET%
722-
cd vim\src2\testdir
723-
:: Wait about 10 minutes.
724-
for /L %%i in (1,1,60) do (
725-
if exist done.txt goto exitloop
726-
ping -n 11 localhost > nul
727-
)
728-
set timeout=1
729-
:exitloop
730-
731-
echo %COL_GREEN%Test results of vim:%COL_RESET%
732-
if exist messages type messages
733-
nmake -nologo -f Make_mvc.mak report VIMPROG=..\..\src\vim || exit 1
734-
if "%timeout%"=="1" (
735-
echo %COL_RED%Timed out.%COL_RESET%
736-
exit 1
737-
)
723+
call vim\src\msvc-latest ${{ matrix.vcarch }}
724+
725+
echo %COL_GREEN%Test vim:%COL_RESET%
726+
cd vim\src2\testdir
727+
nmake -nologo -f Make_mvc.mak VIMPROG=..\..\src\vim || exit 1
738728
739729
- name: Build Vim launcher
740730
shell: cmd

0 commit comments

Comments
 (0)