patch 9.1.0606: tests: generated files may cause failure in test_codestyle
Commit:
https://github.com/vim/vim/commit/c8a582aad5bd22eaf852e82d07ea91fe183b4cc6
Author: Ken Takata <ken...@csc.jp>
Date: Sat Jul 20 11:55:13 2024 +0200
patch 9.1.0606: tests: generated files may cause failure in test_codestyle
Problem: tests: generated files may cause failure in test_codestyle
Solution: Exclude OLE-related generated files from style checks.
(Ken Takata)
Some OLE-related auto-generated files may contain space errors:
https://ci.appveyor.com/project/chrisbra/vim-win32-installer/builds/50248542/job/w45ve9yd6qmmws8t#L11475
```
From test_codestyle.vim:
Found errors in Test_source_files():
command line..script
C:/projects/vim-win32-installer/vim/src/testdir/runtest.vim[607]..function
RunTheTest[57]..Test_source_files[8]..<SNR>8_PerformCheck[11]..<SNR>8_ReportError
line 2: ../dlldata.c line 2: trailing white space
command line..script
C:/projects/vim-win32-installer/vim/src/testdir/runtest.vim[607]..function
RunTheTest[57]..Test_source_files[8]..<SNR>8_PerformCheck[11]..<SNR>8_ReportError
line 2: ../iid_ole.c line 12: trailing white space
command line..script
C:/projects/vim-win32-installer/vim/src/testdir/runtest.vim[607]..function
RunTheTest[57]..Test_source_files[6]..<SNR>8_PerformCheck[11]..<SNR>8_ReportError
line 2: ../if_ole.h line 60: space before Tab
command line..script
C:/projects/vim-win32-installer/vim/src/testdir/runtest.vim[607]..function
RunTheTest[57]..Test_source_files[8]..<SNR>8_PerformCheck[11]..<SNR>8_ReportError
line 2: ../if_ole.h line 10: trailing white space
```
Exclude them from style checking.
closes: #15309
Signed-off-by: Ken Takata <ken...@csc.jp>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/src/testdir/test_codestyle.vim b/src/testdir/test_codestyle.vim
index 58ccb6abb..83f52ef34 100644
--- a/src/testdir/test_codestyle.vim
+++ b/src/testdir/test_codestyle.vim
@@ -28,6 +28,13 @@ def Test_source_files()
g:ignoreSwapExists = 'e'
exe 'edit ' .. fname
+ # Some files are generated files and may contain space errors.
+ if fname =~ 'dlldata.c'
+ || fname =~ 'if_ole.h'
+ || fname =~ 'iid_ole.c'
+ continue
+ endif
+
PerformCheck(fname, ' ', 'space before Tab', '')
PerformCheck(fname, '\s$', 'trailing white space', '')
diff --git a/src/version.c b/src/version.c
index a04e7b8c8..238437380 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 606,
/**/
605,
/**/
--
--
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 vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1sV6sp-00G2Vo-QJ%40256bit.org.
