diff options
| author | tisi1988 <tisi1988@gmail.com> | 2018-08-07 11:12:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-07 11:12:00 +0200 |
| commit | e9b05a4d6aa7f471cbb1bd30c3b9792c939de127 (patch) | |
| tree | f38bcb2d7e6ae7353fa09aae5ba59cc3019ae1e8 /googlemock/test | |
| parent | 25e1436b087ac2b05a4b5eeb0a2704a53016be2d (diff) | |
| parent | 28b71e444c41ad93225145e029db4957f15aaae6 (diff) | |
| download | googletest-e9b05a4d6aa7f471cbb1bd30c3b9792c939de127.tar.gz googletest-e9b05a4d6aa7f471cbb1bd30c3b9792c939de127.tar.bz2 googletest-e9b05a4d6aa7f471cbb1bd30c3b9792c939de127.zip | |
Merge branch 'master' into master
Diffstat (limited to 'googlemock/test')
| -rw-r--r-- | googlemock/test/gmock-actions_test.cc | 2 | ||||
| -rwxr-xr-x | googlemock/test/gmock_leak_test.py | 2 | ||||
| -rwxr-xr-x | googlemock/test/gmock_output_test.py | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc index e8bdbee7..2d169f88 100644 --- a/googlemock/test/gmock-actions_test.cc +++ b/googlemock/test/gmock-actions_test.cc @@ -937,6 +937,8 @@ class Foo { int value_; }; +// GOOGLETEST_CM0005 DO NOT DELETE + // Tests InvokeWithoutArgs(function). TEST(InvokeWithoutArgsTest, Function) { // As an action that takes one argument. diff --git a/googlemock/test/gmock_leak_test.py b/googlemock/test/gmock_leak_test.py index 997680ce..a2fee4b6 100755 --- a/googlemock/test/gmock_leak_test.py +++ b/googlemock/test/gmock_leak_test.py @@ -33,10 +33,8 @@ __author__ = 'wan@google.com (Zhanyong Wan)' - import gmock_test_utils - PROGRAM_PATH = gmock_test_utils.GetTestExecutablePath('gmock_leak_test_') TEST_WITH_EXPECT_CALL = [PROGRAM_PATH, '--gtest_filter=*ExpectCall*'] TEST_WITH_ON_CALL = [PROGRAM_PATH, '--gtest_filter=*OnCall*'] diff --git a/googlemock/test/gmock_output_test.py b/googlemock/test/gmock_output_test.py index 9d73d570..8f57d46c 100755 --- a/googlemock/test/gmock_output_test.py +++ b/googlemock/test/gmock_output_test.py @@ -43,7 +43,6 @@ __author__ = 'wan@google.com (Zhanyong Wan)' import os import re import sys - import gmock_test_utils |