Adding PRESUBMIT check to avoid mixing C, C++ and Objc-C/Obj-C++.
The error message will be something like:
GN targets cannot mix .c (or .cc) and .m (or .mm) source files.
Please create a separate target for each collection of sources.
Mixed sources:
{
BUILD_GN_PATH: [
[
TARGET_NAME,
[
SOURCES
]
],
...
],
...
}
Bug: webrtc:7743
Change-Id: I45dd2c621b830e5aeb081fa8d17c9497a49c2554
Reviewed-on: https://webrtc-review.googlesource.com/1980
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Henrik Kjellander <kjellander@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#19897}
This commit is contained in:
committed by
Commit Bot
parent
7de1eb7bdc
commit
0c15c5332f
@ -60,7 +60,7 @@ class CheckNewlineAtTheEndOfProtoFilesTest(unittest.TestCase):
|
||||
shutil.rmtree(self.tmp_dir, ignore_errors=True)
|
||||
|
||||
def testErrorIfProtoFileDoesNotEndWithNewline(self):
|
||||
self.__GenerateProtoWithoutNewlineAtTheEnd()
|
||||
self._GenerateProtoWithoutNewlineAtTheEnd()
|
||||
self.input_api.files = [MockFile(self.proto_file_path)]
|
||||
errors = PRESUBMIT.CheckNewlineAtTheEndOfProtoFiles(self.input_api,
|
||||
self.output_api)
|
||||
@ -70,13 +70,13 @@ class CheckNewlineAtTheEndOfProtoFilesTest(unittest.TestCase):
|
||||
str(errors[0]))
|
||||
|
||||
def testNoErrorIfProtoFileEndsWithNewline(self):
|
||||
self.__GenerateProtoWithNewlineAtTheEnd()
|
||||
self._GenerateProtoWithNewlineAtTheEnd()
|
||||
self.input_api.files = [MockFile(self.proto_file_path)]
|
||||
errors = PRESUBMIT.CheckNewlineAtTheEndOfProtoFiles(self.input_api,
|
||||
self.output_api)
|
||||
self.assertEqual(0, len(errors))
|
||||
|
||||
def __GenerateProtoWithNewlineAtTheEnd(self):
|
||||
def _GenerateProtoWithNewlineAtTheEnd(self):
|
||||
with open(self.proto_file_path, 'w') as f:
|
||||
f.write(textwrap.dedent("""
|
||||
syntax = "proto2";
|
||||
@ -84,7 +84,7 @@ class CheckNewlineAtTheEndOfProtoFilesTest(unittest.TestCase):
|
||||
package webrtc.audioproc;
|
||||
"""))
|
||||
|
||||
def __GenerateProtoWithoutNewlineAtTheEnd(self):
|
||||
def _GenerateProtoWithoutNewlineAtTheEnd(self):
|
||||
with open(self.proto_file_path, 'w') as f:
|
||||
f.write(textwrap.dedent("""
|
||||
syntax = "proto2";
|
||||
@ -92,5 +92,72 @@ class CheckNewlineAtTheEndOfProtoFilesTest(unittest.TestCase):
|
||||
package webrtc.audioproc;"""))
|
||||
|
||||
|
||||
class CheckNoMixingSourcesTest(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.tmp_dir = tempfile.mkdtemp()
|
||||
self.file_path = os.path.join(self.tmp_dir, 'BUILD.gn')
|
||||
self.input_api = MockInputApi()
|
||||
self.output_api = MockOutputApi()
|
||||
|
||||
def tearDown(self):
|
||||
shutil.rmtree(self.tmp_dir, ignore_errors=True)
|
||||
|
||||
def testErrorIfCAndCppAreMixed(self):
|
||||
self._AssertNumberOfErrorsWithSources(1, ['foo.c', 'bar.cc', 'bar.h'])
|
||||
|
||||
def testErrorIfCAndObjCAreMixed(self):
|
||||
self._AssertNumberOfErrorsWithSources(1, ['foo.c', 'bar.m', 'bar.h'])
|
||||
|
||||
def testErrorIfCAndObjCppAreMixed(self):
|
||||
self._AssertNumberOfErrorsWithSources(1, ['foo.c', 'bar.mm', 'bar.h'])
|
||||
|
||||
def testErrorIfCppAndObjCAreMixed(self):
|
||||
self._AssertNumberOfErrorsWithSources(1, ['foo.cc', 'bar.m', 'bar.h'])
|
||||
|
||||
def testErrorIfCppAndObjCppAreMixed(self):
|
||||
self._AssertNumberOfErrorsWithSources(1, ['foo.cc', 'bar.mm', 'bar.h'])
|
||||
|
||||
def testNoErrorIfOnlyC(self):
|
||||
self._AssertNumberOfErrorsWithSources(0, ['foo.c', 'bar.c', 'bar.h'])
|
||||
|
||||
def testNoErrorIfOnlyCpp(self):
|
||||
self._AssertNumberOfErrorsWithSources(0, ['foo.cc', 'bar.cc', 'bar.h'])
|
||||
|
||||
def testNoErrorIfOnlyObjC(self):
|
||||
self._AssertNumberOfErrorsWithSources(0, ['foo.m', 'bar.m', 'bar.h'])
|
||||
|
||||
def testNoErrorIfOnlyObjCpp(self):
|
||||
self._AssertNumberOfErrorsWithSources(0, ['foo.mm', 'bar.mm', 'bar.h'])
|
||||
|
||||
def testNoErrorIfObjCAndObjCppAreMixed(self):
|
||||
self._AssertNumberOfErrorsWithSources(0, ['foo.m', 'bar.mm', 'bar.h'])
|
||||
|
||||
def _AssertNumberOfErrorsWithSources(self, number_of_errors, sources):
|
||||
assert 3 == len(sources), 'This function accepts a list of 3 source files'
|
||||
self._GenerateBuildFile(textwrap.dedent("""
|
||||
rtc_source_set("foo_bar") {
|
||||
sources = [
|
||||
"%s",
|
||||
"%s",
|
||||
"%s",
|
||||
],
|
||||
}
|
||||
""" % tuple(sources)))
|
||||
self.input_api.files = [MockFile(self.file_path)]
|
||||
errors = PRESUBMIT.CheckNoMixingSources(self.input_api,
|
||||
[MockFile(self.file_path)],
|
||||
self.output_api)
|
||||
self.assertEqual(number_of_errors, len(errors))
|
||||
if number_of_errors == 1:
|
||||
for source in sources:
|
||||
if not source.endswith('.h'):
|
||||
self.assertTrue(source in str(errors[0]))
|
||||
|
||||
def _GenerateBuildFile(self, content):
|
||||
with open(self.file_path, 'w') as f:
|
||||
f.write(content)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
Reference in New Issue
Block a user