summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorkosak@google.com <kosak@google.com@8415998a-534a-0410-bf83-d39667b30386>2015-07-28 00:53:13 +0000
committerkosak@google.com <kosak@google.com@8415998a-534a-0410-bf83-d39667b30386>2015-07-28 00:53:13 +0000
commit41c96c83a341e0b626b804fa878cbef6c532df68 (patch)
treef2260edc093ffec7cf9715e787ee83e26f99dd36 /scripts
parenteb9a3eda1eb54751aff12642a6692b92494e46ad (diff)
downloadgooglemock-master.tar.gz
Rename custom/callback-actions.h[.pump] =>HEADmaster
custom/gmock-generated-actions.h[.pump]. git-svn-id: http://googlemock.googlecode.com/svn/trunk@566 8415998a-534a-0410-bf83-d39667b30386
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/gmock_doctor.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/gmock_doctor.py b/scripts/gmock_doctor.py
index 94e7af6..9ac4653 100755
--- a/scripts/gmock_doctor.py
+++ b/scripts/gmock_doctor.py
@@ -308,7 +308,7 @@ def _OverloadedFunctionActionDiagnoser(msg):
clang_regex = (_CLANG_FILE_LINE_RE + r'error: no matching '
r'function for call to \'Invoke\'\r?\n'
r'(.*\n)*?'
- r'.*\bcallback-actions\.h:\d+:\d+:\s+'
+ r'.*\bgmock-generated-actions\.h:\d+:\d+:\s+'
r'note: candidate template ignored:\s+'
r'couldn\'t infer template argument \'FunctionImpl\'')
diagnosis = """
@@ -334,7 +334,7 @@ def _OverloadedMethodActionDiagnoser(msg):
clang_regex = (_CLANG_FILE_LINE_RE + r'error: no matching function '
r'for call to \'Invoke\'\r?\n'
r'(.*\n)*?'
- r'.*\bcallback-actions\.h:\d+:\d+: '
+ r'.*\bgmock-generated-actions\.h:\d+:\d+: '
r'note: candidate function template not viable: '
r'requires .*, but 2 (arguments )?were provided')
diagnosis = """