summaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-05-23 15:49:11 (GMT)
committerGennadiy Civil <misterg@google.com>2018-05-23 15:49:11 (GMT)
commit8977af0ecfdd49baedfd4ea020afe68d5c5e1fbb (patch)
tree22f3ee29ece3b48beb2c1a1d64ced2d28834d5aa /googlemock
parent4e4df226fc197c0dda6e37f5c8c3845ca1e73a49 (diff)
downloadgoogletest-8977af0ecfdd49baedfd4ea020afe68d5c5e1fbb.zip
googletest-8977af0ecfdd49baedfd4ea020afe68d5c5e1fbb.tar.gz
googletest-8977af0ecfdd49baedfd4ea020afe68d5c5e1fbb.tar.bz2
formatting changes refs/pull/1608/head
Diffstat (limited to 'googlemock')
-rw-r--r--googlemock/scripts/generator/README9
-rwxr-xr-xgooglemock/test/gmock_test_utils.py2
2 files changed, 5 insertions, 6 deletions
diff --git a/googlemock/scripts/generator/README b/googlemock/scripts/generator/README
index d6f9597..01fd463 100644
--- a/googlemock/scripts/generator/README
+++ b/googlemock/scripts/generator/README
@@ -1,11 +1,10 @@
The Google Mock class generator is an application that is part of cppclean.
-For more information about cppclean, see the README.cppclean file or
-visit http://code.google.com/p/cppclean/
+For more information about cppclean, visit http://code.google.com/p/cppclean/
-cppclean requires Python 2.3.5 or later. If you don't have Python installed
-on your system, you will also need to install it. You can download Python
-from: http://www.python.org/download/releases/
+The mock generator requires Python 2.3.5 or later. If you don't have Python
+installed on your system, you will also need to install it. You can download
+Python from: http://www.python.org/download/releases/
To use the Google Mock class generator, you need to call it
on the command line passing the header file and class for which you want
diff --git a/googlemock/test/gmock_test_utils.py b/googlemock/test/gmock_test_utils.py
index b513000..92b1ac1 100755
--- a/googlemock/test/gmock_test_utils.py
+++ b/googlemock/test/gmock_test_utils.py
@@ -38,7 +38,7 @@ import sys
SCRIPT_DIR = os.path.dirname(__file__) or '.'
# isdir resolves symbolic links.
-gtest_tests_util_dir = os.path.join(SCRIPT_DIR, '../googletest/test')
+gtest_tests_util_dir = os.path.join(SCRIPT_DIR, '../../googletest/test')
if os.path.isdir(gtest_tests_util_dir):
GTEST_TESTS_UTIL_DIR = gtest_tests_util_dir
else: