50 lines
2.3 KiB
Diff
50 lines
2.3 KiB
Diff
From c8a582aad5bd22eaf852e82d07ea91fe183b4cc6 Mon Sep 17 00:00:00 2001
|
|
From: Ken Takata <kentkt@csc.jp>
|
|
Date: Sat, 20 Jul 2024 11:55:13 +0200
|
|
Subject: [PATCH] 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 <kentkt@csc.jp>
|
|
Signed-off-by: Christian Brabandt <cb@256bit.org>
|
|
---
|
|
src/testdir/test_codestyle.vim | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/src/testdir/test_codestyle.vim b/src/testdir/test_codestyle.vim
|
|
index 58ccb6abba66f..83f52ef34cd60 100644
|
|
--- a/src/testdir/test_codestyle.vim
|
|
+++ b/src/testdir/test_codestyle.vim
|
|
@@ -24,6 +24,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', '')
|