diff options
| -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', ], }, }], |