diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-03 21:28:14 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-03 21:28:14 +0000 |
| commit | c957f41811ad9b86656e804d6f4728349bdcf11d (patch) | |
| tree | a60aaa3bc5c19c3e08037c05d8d563d847a83949 | |
| parent | ca3c13289c257f9c034d48360d3e62048213cb75 (diff) | |
| download | chromium_src-c957f41811ad9b86656e804d6f4728349bdcf11d.zip chromium_src-c957f41811ad9b86656e804d6f4728349bdcf11d.tar.gz chromium_src-c957f41811ad9b86656e804d6f4728349bdcf11d.tar.bz2 | |
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
Review URL: https://codereview.chromium.org/11431003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170815 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | base/message_pump_io_ios_unittest.cc | 2 | ||||
| -rw-r--r-- | testing/gtest.gyp | 5 |
3 files changed, 8 insertions, 3 deletions
@@ -56,10 +56,10 @@ deps = { (Var("googlecode_url") % "open-vcdiff") + "/trunk@42", "src/testing/gtest": - (Var("googlecode_url") % "googletest") + "/trunk@621", + (Var("googlecode_url") % "googletest") + "/trunk@629", "src/testing/gmock": - (Var("googlecode_url") % "googlemock") + "/trunk@405", + (Var("googlecode_url") % "googlemock") + "/trunk@410", "src/third_party/angle": (Var("googlecode_url") % "angleproject") + "/trunk@1394", diff --git a/base/message_pump_io_ios_unittest.cc b/base/message_pump_io_ios_unittest.cc index ddf740f..7a00d11 100644 --- a/base/message_pump_io_ios_unittest.cc +++ b/base/message_pump_io_ios_unittest.cc @@ -79,7 +79,7 @@ TEST_F(MessagePumpIOSForIOTest, TestWatchingFromBadThread) { MessagePumpIOSForIO::FileDescriptorWatcher watcher; StupidWatcher delegate; - ASSERT_DEBUG(io_loop()->WatchFileDescriptor( + ASSERT_DEBUG_DEATH(io_loop()->WatchFileDescriptor( STDOUT_FILENO, false, MessageLoopForIO::WATCH_READ, &watcher, &delegate), "Check failed: " "watch_file_descriptor_caller_checker_.CalledOnValidThread()"); diff --git a/testing/gtest.gyp b/testing/gtest.gyp index 9dfb16f..7c225e8 100644 --- a/testing/gtest.gyp +++ b/testing/gtest.gyp @@ -128,10 +128,15 @@ # own implementation but we must opt in to it. 'defines': [ 'GTEST_USE_OWN_TR1_TUPLE=1', + # GTEST_USE_OWN_TR1_TUPLE only works if GTEST_HAS_TR1_TUPLE is set. + # gtest r625 made it so that GTEST_HAS_TR1_TUPLE is set to 0 + # automatically on android, so it has to be set explicitly here. + 'GTEST_HAS_TR1_TUPLE=1', ], 'direct_dependent_settings': { 'defines': [ 'GTEST_USE_OWN_TR1_TUPLE=1', + 'GTEST_HAS_TR1_TUPLE=1', ], }, }], |