diff options
| author | Tanzinul Islam <tanzislam@users.noreply.github.com> | 2018-03-05 02:25:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-05 02:25:59 +0000 |
| commit | a7a7f51d355081a7f1e8ab295d5df5f9bb4612c8 (patch) | |
| tree | c6f8f6067f957eb6d49656278f79c93353bb039c /googlemock/test/gmock_output_test.py | |
| parent | 4ba3803f936a2f432e60841bc9358ea2f3a951eb (diff) | |
| parent | 6c73adfc03e277f55cb1e4947b3a5e6c5ff4fe46 (diff) | |
| download | googletest-a7a7f51d355081a7f1e8ab295d5df5f9bb4612c8.tar.gz googletest-a7a7f51d355081a7f1e8ab295d5df5f9bb4612c8.tar.bz2 googletest-a7a7f51d355081a7f1e8ab295d5df5f9bb4612c8.zip | |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
Diffstat (limited to 'googlemock/test/gmock_output_test.py')
| -rwxr-xr-x | googlemock/test/gmock_output_test.py | 13 |
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() |