Skip to content

Commit c8a582a

Browse files
k-takatachrisbra
authored andcommitted
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 <[email protected]> Signed-off-by: Christian Brabandt <[email protected]>
1 parent 0be03e1 commit c8a582a

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

src/testdir/test_codestyle.vim

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ def Test_source_files()
2828
g:ignoreSwapExists = 'e'
2929
exe 'edit ' .. fname
3030

31+
# Some files are generated files and may contain space errors.
32+
if fname =~ 'dlldata.c'
33+
|| fname =~ 'if_ole.h'
34+
|| fname =~ 'iid_ole.c'
35+
continue
36+
endif
37+
3138
PerformCheck(fname, ' \t', 'space before Tab', '')
3239

3340
PerformCheck(fname, '\s$', 'trailing white space', '')

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,8 @@ static char *(features[]) =
704704

705705
static int included_patches[] =
706706
{ /* Add new patch number below this line */
707+
/**/
708+
606,
707709
/**/
708710
605,
709711
/**/

0 commit comments

Comments
 (0)