diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-12 04:32:05 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-12 04:32:05 +0000 |
| commit | 0fa0fbc5767ec406aa44c48ea5f775d158042bb2 (patch) | |
| tree | cb62f9e2531768a118786f4d7a370e101f375280 | |
| parent | acf879fc6ac06b8caada5dd2c79f0ae4c61cc25d (diff) | |
| download | chromium_src-0fa0fbc5767ec406aa44c48ea5f775d158042bb2.zip chromium_src-0fa0fbc5767ec406aa44c48ea5f775d158042bb2.tar.gz chromium_src-0fa0fbc5767ec406aa44c48ea5f775d158042bb2.tar.bz2 | |
Roll gtest 445 -> 446
I want to get to r492 to pick up the fix for http://code.google.com/p/googletest/issues/detail?id=321 , but r446 needs some changes, so I'm doing an extra commit for this revision. See comments at http://code.google.com/p/googletest/source/detail?r=446
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/3705002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62246 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | build/common.gypi | 8 | ||||
| -rw-r--r-- | chrome_frame/test/exception_barrier_unittest.cc | 2 |
3 files changed, 10 insertions, 2 deletions
@@ -31,7 +31,7 @@ deps = { (Var("googlecode_url") % "open-vcdiff") + "/trunk@28", "src/testing/gtest": - (Var("googlecode_url") % "googletest") + "/trunk@445", + (Var("googlecode_url") % "googletest") + "/trunk@446", "src/third_party/angle": (Var("googlecode_url") % "angleproject") + "/trunk@447", diff --git a/build/common.gypi b/build/common.gypi index d028565..3f37e4e 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1143,6 +1143,10 @@ '-Wno-bool-conversions', # Don't die on dtoa code that uses a char as an array index. '-Wno-char-subscripts', + # Survive EXPECT_EQ(unnamed_enum, unsigned int) -- see + # http://code.google.com/p/googletest/source/detail?r=446 . + # TODO(thakis): Use -isystem instead (http://crbug.com/58751 ). + '-Wno-unnamed-type-template-args', ], 'cflags!': [ # Clang doesn't seem to know know this flag. @@ -1251,6 +1255,10 @@ # Don't die on dtoa code that uses a char as an array index. # This is required solely for base/third_party/dmg_fp/dtoa.cc. '-Wno-char-subscripts', + # Survive EXPECT_EQ(unnamed_enum, unsigned int) -- see + # http://code.google.com/p/googletest/source/detail?r=446 . + # TODO(thakis): Use -isystem instead (http://crbug.com/58751 ). + '-Wno-unnamed-type-template-args', ], }], ], diff --git a/chrome_frame/test/exception_barrier_unittest.cc b/chrome_frame/test/exception_barrier_unittest.cc index 73f006a..3274318 100644 --- a/chrome_frame/test/exception_barrier_unittest.cc +++ b/chrome_frame/test/exception_barrier_unittest.cc @@ -168,7 +168,7 @@ TEST_F(ExceptionBarrierTest, RegisterUnregister) { EXCEPTION_REGISTRATION registration; ::RegisterExceptionRecord(®istration, ExceptionBarrierHandler); EXPECT_EQ(GetTopRegistration(), ®istration); - EXPECT_EQ(ExceptionBarrierHandler, registration.handler); + EXPECT_EQ(&ExceptionBarrierHandler, registration.handler); EXPECT_EQ(top, registration.prev); // test the whole chain for good measure |