diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-08 12:19:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-08 12:19:04 -0700 |
| commit | 11f5a2740aa8a55d620fba6957e53ad08721cf54 (patch) | |
| tree | 04f982e6158e57f68529ca47e37ec377574647dd /googlemock/test/gmock_output_test.py | |
| parent | 008e54c1dd407b6edd680fccf78cd194365e0507 (diff) | |
| parent | 66bd580b5bc054522f7fab13463a47aa156a2d4b (diff) | |
| download | googletest-11f5a2740aa8a55d620fba6957e53ad08721cf54.tar.gz googletest-11f5a2740aa8a55d620fba6957e53ad08721cf54.tar.bz2 googletest-11f5a2740aa8a55d620fba6957e53ad08721cf54.zip | |
Merge branch 'master' into cross-testing-patch-1
Diffstat (limited to 'googlemock/test/gmock_output_test.py')
| -rwxr-xr-x | googlemock/test/gmock_output_test.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/googlemock/test/gmock_output_test.py b/googlemock/test/gmock_output_test.py index eced8a81..8f57d46c 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)' @@ -43,7 +43,6 @@ __author__ = 'wan@google.com (Zhanyong Wan)' import os import re import sys - import gmock_test_utils @@ -176,5 +175,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() |