diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-06-04 16:54:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-04 16:54:25 +0200 |
| commit | 7b08984da0cdee2156e45453a540030fae28156f (patch) | |
| tree | 1294cee0e38859355d218186363647c309fc0bdc /googlemock/test/gmock_test_utils.py | |
| parent | 93e267a999a3528b21ce0e51412e889f87288f24 (diff) | |
| parent | db5f9ec567daff3beba53fd0bcd98e3f3562404c (diff) | |
| download | googletest-7b08984da0cdee2156e45453a540030fae28156f.tar.gz googletest-7b08984da0cdee2156e45453a540030fae28156f.tar.bz2 googletest-7b08984da0cdee2156e45453a540030fae28156f.zip | |
Merge branch 'master' into fuchsia-launchpad-removal
Diffstat (limited to 'googlemock/test/gmock_test_utils.py')
| -rwxr-xr-x | googlemock/test/gmock_test_utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/test/gmock_test_utils.py b/googlemock/test/gmock_test_utils.py index b5130001..92b1ac14 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: |