diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-02-09 10:41:09 -0500 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-02-09 10:41:09 -0500 |
| commit | ec7faa943d7817c81ce7bdf71a21ebc9244dc8de (patch) | |
| tree | 93570e0098d107f38417c6524b79c26dbda37120 /googlemock | |
| parent | a3c73ed28d7995b18d48027aee740ad827fcc157 (diff) | |
| download | googletest-ec7faa943d7817c81ce7bdf71a21ebc9244dc8de.tar.gz googletest-ec7faa943d7817c81ce7bdf71a21ebc9244dc8de.tar.bz2 googletest-ec7faa943d7817c81ce7bdf71a21ebc9244dc8de.zip | |
merges
Diffstat (limited to 'googlemock')
| -rwxr-xr-x | googlemock/test/gmock_output_test.py | 13 | ||||
| -rwxr-xr-x | googlemock/test/gmock_test_utils.py | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/googlemock/test/gmock_output_test.py b/googlemock/test/gmock_output_test.py index eced8a81..9d73d570 100755 --- a/googlemock/test/gmock_output_test.py +++ b/googlemock/test/gmock_output_test.py @@ -31,11 +31,11 @@ """Tests the text output of Google C++ Mocking Framework. -SYNOPSIS - gmock_output_test.py --build_dir=BUILD/DIR --gengolden - # where BUILD/DIR contains the built gmock_output_test_ file. - gmock_output_test.py --gengolden - gmock_output_test.py +To update the golden file: +gmock_output_test.py --build_dir=BUILD/DIR --gengolden +# where BUILD/DIR contains the built gmock_output_test_ file. +gmock_output_test.py --gengolden +gmock_output_test.py """ __author__ = 'wan@google.com (Zhanyong Wan)' @@ -176,5 +176,8 @@ if __name__ == '__main__': golden_file = open(GOLDEN_PATH, 'wb') golden_file.write(output) golden_file.close() + # Suppress the error "googletest was imported but a call to its main() + # was never detected." + os._exit(0) else: gmock_test_utils.Main() diff --git a/googlemock/test/gmock_test_utils.py b/googlemock/test/gmock_test_utils.py index 1983c53b..b5130001 100755 --- a/googlemock/test/gmock_test_utils.py +++ b/googlemock/test/gmock_test_utils.py @@ -34,7 +34,6 @@ __author__ = 'wan@google.com (Zhanyong Wan)' import os import sys - # Determines path to gtest_test_utils and imports it. SCRIPT_DIR = os.path.dirname(__file__) or '.' @@ -44,9 +43,10 @@ if os.path.isdir(gtest_tests_util_dir): GTEST_TESTS_UTIL_DIR = gtest_tests_util_dir else: GTEST_TESTS_UTIL_DIR = os.path.join(SCRIPT_DIR, '../../googletest/test') - sys.path.append(GTEST_TESTS_UTIL_DIR) -import gtest_test_utils # pylint: disable-msg=C6204 + +# pylint: disable=C6204 +import gtest_test_utils def GetSourceDir(): |