Pulls in gtest r344; improves implicit_cast (by Zhanyong Wan); makes the Python tests work on Windows (by Vlad Losev); adds run_tests.py (by Vlad Losev).

git-svn-id: http://googlemock.googlecode.com/svn/trunk@241 8415998a-534a-0410-bf83-d39667b30386

1 files changed, 3 insertions, 3 deletions

diff --git a/scripts/gmock_doctor.py b/scripts/gmock_doctor.py
index d21b9ee..74af108 100755
--- a/scripts/gmock_doctor.py
+++ b/scripts/gmock_doctor.py
@@ -340,11 +340,11 @@ def _NeedToUseReturnNullDiagnoser(msg):
   regex = ('instantiated from \'testing::internal::ReturnAction<R>'
            '::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'.*error: no matching function for call to \'implicit_cast\('
+           r'long int&\)')
   diagnosis = """
 You are probably calling Return(NULL) and the compiler isn't sure how to turn
-NULL into a %(type)s*. Use ReturnNull() instead.
+NULL into the right type. Use ReturnNull() instead.
 Note: the line number may be off; please fix all instances of Return(NULL)."""
   return _GenericDiagnoser('NRNULL', 'Need to use ReturnNull',
                            regex, diagnosis, msg)