diff options
| author | Bernhard Bauer <sheepmaster@gmail.com> | 2018-03-12 18:15:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-12 18:15:35 +0000 |
| commit | fc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d (patch) | |
| tree | 0718a372bf66172bf4d3415eca6eb5d1f96b41fa /googlemock/test/gmock_output_test.py | |
| parent | 7b70413e0ca57b3e48d7655f342122f159f52b31 (diff) | |
| parent | abc6e943e0878af67b91fa8a646edf717195c80c (diff) | |
| download | googletest-fc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d.tar.gz googletest-fc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d.tar.bz2 googletest-fc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d.zip | |
Merge branch 'master' into upstream_188748737
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() |