patch 9.2.0195: CI: test-suite gets killed for taking too long
Commit:
https://github.com/vim/vim/commit/e5df6e8d422a751c237f84767c3f3bab2527791c
Author: Christian Brabandt <[email protected]>
Date: Wed Mar 18 20:47:45 2026 +0000
patch 9.2.0195: CI: test-suite gets killed for taking too long
Problem: test_codestyle.vim takes too much time and takes more than
90s, this contributes to the overall time for all runners and
Solution: Create a dedicated 'make codestyle' target in the testdir
Makefiles. Remove test_codestyle from the main test list.
Update GitHub CI to run this check as a separate step
in the 'normal' features build.
Increase CI timeout to 45 minutes.
fixes: #19740
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a8948eed9..cdfe56c27 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -84,7 +84,7 @@ jobs:
architecture: arm64
- features: normal
compiler: gcc
- extra: [vimtags, proto, preproc_indent, encoding]
+ extra: [vimtags, proto, preproc_indent, encoding, codestyle]
- features: huge
compiler: gcc
extra: [no_x11_wl]
@@ -335,7 +335,7 @@ jobs:
fi
- name: Test
- timeout-minutes: 30
+ timeout-minutes: 45
run: |
make ${SHADOWOPT} ${TEST}
@@ -370,6 +370,11 @@ jobs:
true
)
+ - name: Check Source Code style
+ if: contains(matrix.extra, 'codestyle')
+ run: |
+ make -C src/testdir codestyle
+
- name: Check preprocessor indent
if: contains(matrix.extra, 'preproc_indent')
run: |
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index 07bea0702..28a5ec663 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -112,7 +112,6 @@ NEW_TESTS = \
test_cmdline \
test_cmdmods \
test_cmdwin \
- test_codestyle \
test_command_count \
test_comments \
test_comparators \
@@ -406,7 +405,6 @@ NEW_TESTS_RES = \
test_cmdline.res \
test_cmdmods.res \
test_cmdwin.res \
- test_codestyle.res \
test_command_count.res \
test_comments.res \
test_comparators.res \
diff --git a/src/testdir/Make_mvc.mak b/src/testdir/Make_mvc.mak
index 41ecce716..5b492d7dc 100644
--- a/src/testdir/Make_mvc.mak
+++ b/src/testdir/Make_mvc.mak
@@ -41,6 +41,15 @@ tiny: nolog tinytests report
benchmark: $(SCRIPTS_BENCH)
+codestyle:
+ -@ if exist test_codestyle.res $(RM) test_codestyle.res
+ -@ if exist test.log $(RM) test.log
+ -@ if exist messages $(RM) messages
+ -@ if exist starttime $(RM) starttime
+ @ $(MAKE) -lf Make_mvc.mak VIMPROG=$(VIMPROG) test_codestyle.res
+ @ type messages
+ @ if exist test.log exit 1
+
report:
@ rem without the +eval feature test_result.log is a copy of test.log
@ if exist test.log ( $(CP) test.log test_result.log > nul ) \
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 7c39b47e6..2e1d900b8 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -74,6 +74,14 @@ $(NEW_TESTS):
exit 1; \
fi
+codestyle:
+ rm -f test_codestyle.res $(CLEANUP_FILES)
+ @MAKEFLAGS=--no-print-directory $(MAKE) -f Makefile test_codestyle.res
VIMPROG=$(VIMPROG) XXDPROG=$(XXDPROG) SCRIPTSOURCE=$(SCRIPTSOURCE)
+ @cat messages
+ @if test -f test.log; then \
+ exit 1; \
+ fi
+
# Run only tests specific for Vim9 script
test_vim9:
rm -f test_vim9_*.res $(CLEANUP_FILES)
diff --git a/src/version.c b/src/version.c
index acccc10a5..4a23daa86 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 195,
/**/
194,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1w2xzn-00C50J-5g%40256bit.org.
