aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/test/gmock_output_test.py
diff options
context:
space:
mode:
authorTanzinul Islam <t_17_7@hotmail.com>2018-03-05 09:02:59 +0000
committerTanzinul Islam <t_17_7@hotmail.com>2018-03-05 09:02:59 +0000
commit6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0 (patch)
treec6f8f6067f957eb6d49656278f79c93353bb039c /googlemock/test/gmock_output_test.py
parent555e6e79485151cf8c8ada55d57d9ed872591dc5 (diff)
parenta7a7f51d355081a7f1e8ab295d5df5f9bb4612c8 (diff)
downloadgoogletest-6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0.tar.gz
googletest-6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0.tar.bz2
googletest-6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0.zip
Merge branch 'fix_death_test_child_mingw_wer_issue1116' of https://github.com/tanzislam/googletest into fix_death_test_child_mingw_wer_issue1116
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()