diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-06-04 14:54:25 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-04 14:54:25 (GMT) |
| commit | 7b08984da0cdee2156e45453a540030fae28156f (patch) | |
| tree | 1294cee0e38859355d218186363647c309fc0bdc | |
| parent | 93e267a999a3528b21ce0e51412e889f87288f24 (diff) | |
| parent | db5f9ec567daff3beba53fd0bcd98e3f3562404c (diff) | |
| download | googletest-7b08984da0cdee2156e45453a540030fae28156f.zip googletest-7b08984da0cdee2156e45453a540030fae28156f.tar.gz googletest-7b08984da0cdee2156e45453a540030fae28156f.tar.bz2 | |
Merge branch 'master' into fuchsia-launchpad-removal
| -rw-r--r-- | googlemock/scripts/generator/README | 9 | ||||
| -rwxr-xr-x | googlemock/test/gmock_test_utils.py | 2 |
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: |