diff options
| author | Ken Takata <kentkt@csc.jp> | 2024-07-20 11:55:13 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-07-20 11:55:13 +0200 |
| commit | c8a582aad5bd22eaf852e82d07ea91fe183b4cc6 (patch) | |
| tree | c51ba1c983aaff89a6867ca785f32893ee855ead | |
| parent | 0be03e14b9a2899f5e96720e3b21935bd9d2d34e (diff) | |
patch 9.1.0606: tests: generated files may cause failure in test_codestylev9.1.0606
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 <kentkt@csc.jp>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/testdir/test_codestyle.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/testdir/test_codestyle.vim b/src/testdir/test_codestyle.vim index 58ccb6abba..83f52ef34c 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, ' \t', 'space before Tab', '') PerformCheck(fname, '\s$', 'trailing white space', '') diff --git a/src/version.c b/src/version.c index a04e7b8c8d..2384373802 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 606, +/**/ 605, /**/ 604, |