Restore CheckNoStrCatRedefines check and speed up it a little.
CheckNoStrCatRedefines was not used since its inception. This CL enables
the check and adds header/impl filters to make it run faster.
Bug: 1330868
Change-Id: Ie9b57474675a57cb6d6b5fddbf1945c8081c9888
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3679759
Commit-Queue: Bruce Dawson <[email protected]>
Auto-Submit: Aleksey Khoroshilov <[email protected]>
Reviewed-by: Bruce Dawson <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1010614}
diff --git a/PRESUBMIT_test.py b/PRESUBMIT_test.py
index 534973eb..9eb7349 100755
--- a/PRESUBMIT_test.py
+++ b/PRESUBMIT_test.py
@@ -3044,7 +3044,7 @@
MockFile('dir/baz.h', ['#include <atlbase.h>']),
MockFile('dir/jumbo.h', ['#include "sphelper.h"']),
]
- results = PRESUBMIT._CheckNoStrCatRedefines(mock_input_api, MockOutputApi())
+ results = PRESUBMIT.CheckNoStrCatRedefines(mock_input_api, MockOutputApi())
self.assertEqual(1, len(results))
self.assertEqual(4, len(results[0].items))
self.assertTrue('StrCat' in results[0].message)
@@ -3059,7 +3059,7 @@
MockFile('dir/baz_win.cc', ['#include "base/win/shlwapi.h"']),
MockFile('dir/baz-win.h', ['#include "base/win/atl.h"']),
]
- results = PRESUBMIT._CheckNoStrCatRedefines(mock_input_api, MockOutputApi())
+ results = PRESUBMIT.CheckNoStrCatRedefines(mock_input_api, MockOutputApi())
self.assertEqual(0, len(results))
def testAllowsToCreateWrapper(self):
@@ -3069,7 +3069,16 @@
'#include <shlwapi.h>',
'#include "base/win/windows_defines.inc"']),
]
- results = PRESUBMIT._CheckNoStrCatRedefines(mock_input_api, MockOutputApi())
+ results = PRESUBMIT.CheckNoStrCatRedefines(mock_input_api, MockOutputApi())
+ self.assertEqual(0, len(results))
+
+ def testIgnoresNonImplAndHeaders(self):
+ mock_input_api = MockInputApi()
+ mock_input_api.files = [
+ MockFile('dir/foo_win.txt', ['#include "shlwapi.h"']),
+ MockFile('dir/bar.asm', ['#include <propvarutil.h>']),
+ ]
+ results = PRESUBMIT.CheckNoStrCatRedefines(mock_input_api, MockOutputApi())
self.assertEqual(0, len(results))
