Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Issue 11431003: roll gtest 621:629 and gmock 405:410 (Closed)

Created:
8 years ago by Nico
Modified:
8 years ago
Reviewers:
Mark Mentovai
CC:
chromium-reviews
Visibility:
Public.

Description

roll gtest 621:629 and gmock 405:410 gtest: 622: Fixes gtest-tuple.h in Visual C++ 7.1. 623: Removes obsolete debug code. 624: wiki change 625: Improves Android support (by David Turner). 626: wiki change 627: wiki change 628: combines 8 changes: * Fixes some python shebang lines. * Add ElementsAreArray overloads to gmock. * Templatize MatchAndExplain to allow independent string types. * Fix bug where the constructor of the return type of ElementsAre() saves a reference instead of a copy of the arguments. * Extends ElementsAre() to accept arrays whose sizes aren't known. * Switches gTest's internal FilePath class to std::string * Switches gTest & gMock from using testing::internal::String objects to std::string. 629: Unbreak building gtest with -std=c++11 on Mac OS X 10.6. gmock: 406: wiki change 407: Pulls in gtest r615 (Renames internal enums to the kFoo naming style.) 408: Makes gmock's Pointee() work for optional<T> (by Jeffrey Yasskin). 409: wiki change 410: Same commit message as gtest 628. BUG=none Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=170815

Patch Set 1 #

Patch Set 2 : gmock 405:410 #

Patch Set 3 : wtfios #

Patch Set 4 : android #

Patch Set 5 : comment #

Unified diffs Side-by-side diffs Delta from patch set Stats (+8 lines, -3 lines) Patch
M DEPS View 1 1 chunk +2 lines, -2 lines 0 comments Download
M base/message_pump_io_ios_unittest.cc View 1 2 1 chunk +1 line, -1 line 0 comments Download
M testing/gtest.gyp View 1 2 3 4 1 chunk +5 lines, -0 lines 0 comments Download

Messages

Total messages: 3 (0 generated)
Nico
The trybots will tell us if I need to roll gmock too.
8 years ago (2012-12-03 19:26:34 UTC) #1
Nico
On 2012/12/03 19:26:34, Nico wrote: > The trybots will tell us if I need to ...
8 years ago (2012-12-03 19:33:51 UTC) #2
Mark Mentovai
8 years ago (2012-12-03 19:45:09 UTC) #3
LGTM

Powered by Google App Engine
This is Rietveld 408576698