gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjusts gMock Doctor to work with Return implementation updated in r233

Browse Source
This commit is contained in:
vladlosev 2009-11-18 00:42:27 +00:00
parent 201ac16191
commit a63be0bd91
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/gmock_doctor.py
View File

@ -186,8 +186,9 @@ def _NeedToReturnNothingDiagnoser(msg):
"""Diagnoses the NRN disease, given the error messages by gcc.""" """Diagnoses the NRN disease, given the error messages by gcc."""
regex = (_FILE_LINE_RE + r'instantiated from here\n' regex = (_FILE_LINE_RE + r'instantiated from here\n'
r'.*gmock-actions\.h.*error: return-statement with a value, ' r'.*gmock-actions\.h.*error: instantiation of '
r'in function returning \'void\'') r'\'testing::internal::ReturnAction<R>::Impl<F>::value_\' '
r'as type \'void\'')
diagnosis = """ diagnosis = """
You are using an action that returns *something*, but it needs to return You are using an action that returns *something*, but it needs to return
void. Please use a void-returning action instead. void. Please use a void-returning action instead.
@ -336,8 +337,10 @@ Did you forget to write
def _NeedToUseReturnNullDiagnoser(msg): def _NeedToUseReturnNullDiagnoser(msg):
"""Diagnoses the NRNULL disease, given the error messages by gcc.""" """Diagnoses the NRNULL disease, given the error messages by gcc."""
regex = (_FILE_LINE_RE + r'instantiated from here\n' regex = ('instantiated from \'testing::internal::ReturnAction<R>'
r'.*gmock-actions\.h.*error: invalid conversion from ' '::operator testing::Action<Func>\(\) const.*\n' +
_FILE_LINE_RE + r'instantiated from here\n'
r'.*gmock-port\.h.*error: invalid conversion from '
r'\'long int\' to \'(?P<type>.+\*)') r'\'long int\' to \'(?P<type>.+\*)')
diagnosis = """ diagnosis = """
You are probably calling Return(NULL) and the compiler isn't sure how to turn You are probably calling Return(NULL) and the compiler isn't sure how to turn