aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/test/gmock_output_test.py
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2018-02-09 11:00:35 -0500
committerGitHub <noreply@github.com>2018-02-09 11:00:35 -0500
commitc211f21906ca1b40bd10b46052cde85b291963f6 (patch)
tree93570e0098d107f38417c6524b79c26dbda37120 /googlemock/test/gmock_output_test.py
parenta3c73ed28d7995b18d48027aee740ad827fcc157 (diff)
parentec7faa943d7817c81ce7bdf71a21ebc9244dc8de (diff)
downloadgoogletest-c211f21906ca1b40bd10b46052cde85b291963f6.tar.gz
googletest-c211f21906ca1b40bd10b46052cde85b291963f6.tar.bz2
googletest-c211f21906ca1b40bd10b46052cde85b291963f6.zip
Merge pull request #1448 from gennadiycivil/master
merges
Diffstat (limited to 'googlemock/test/gmock_output_test.py')
-rwxr-xr-xgooglemock/test/gmock_output_test.py13
1 files changed, 8 insertions, 5 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()