diff options
| author | tisi1988 <tisi1988@gmail.com> | 2018-08-14 15:32:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-14 15:32:22 +0200 |
| commit | 87a37c60e3144af5394c3e8c8b4c714bb8b07ad9 (patch) | |
| tree | 914079fcbff6431fbacdc9e9bfcffc5060a11884 /googlemock | |
| parent | efe27ac05c66c3fafad0ac0d279543f640ab30f7 (diff) | |
| parent | 8bc11c040a1dcbe50c340b21d78175d152dd3837 (diff) | |
| download | googletest-87a37c60e3144af5394c3e8c8b4c714bb8b07ad9.tar.gz googletest-87a37c60e3144af5394c3e8c8b4c714bb8b07ad9.tar.bz2 googletest-87a37c60e3144af5394c3e8c8b4c714bb8b07ad9.zip | |
Merge branch 'master' into master
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/include/gmock/internal/custom/gmock-matchers.h | 2 | ||||
| -rwxr-xr-x | googlemock/test/gmock_output_test.py | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/googlemock/include/gmock/internal/custom/gmock-matchers.h b/googlemock/include/gmock/internal/custom/gmock-matchers.h index b9b7e3f8..227d91f6 100644 --- a/googlemock/include/gmock/internal/custom/gmock-matchers.h +++ b/googlemock/include/gmock/internal/custom/gmock-matchers.h @@ -31,8 +31,6 @@ // An installation-specific extension point for gmock-matchers.h. // ============================================================ // -// Adds google3 callback support to CallableTraits. - // GOOGLETEST_CM0002 DO NOT DELETE #ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_ diff --git a/googlemock/test/gmock_output_test.py b/googlemock/test/gmock_output_test.py index 8f57d46c..20323e17 100755 --- a/googlemock/test/gmock_output_test.py +++ b/googlemock/test/gmock_output_test.py @@ -29,13 +29,14 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -"""Tests the text output of Google C++ Mocking Framework. +r"""Tests the text output of Google C++ Mocking Framework. To update the golden file: gmock_output_test.py --build_dir=BUILD/DIR --gengolden -# where BUILD/DIR contains the built gmock_output_test_ file. +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)' |