diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-24 22:23:40 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-24 22:23:40 +0000 |
| commit | ba61ec68db053ccc7ba02944869bbfedd122049d (patch) | |
| tree | 5271ef2dea39c9777016b4549cb352b4b3c84970 | |
| parent | cd6d6d5cc4022d01d07ab11885041b5fae846438 (diff) | |
| download | chromium_src-ba61ec68db053ccc7ba02944869bbfedd122049d.zip chromium_src-ba61ec68db053ccc7ba02944869bbfedd122049d.tar.gz chromium_src-ba61ec68db053ccc7ba02944869bbfedd122049d.tar.bz2 | |
Roll gtest 492:539 and gmock 300:358
Skimming their changelogs, it looks like this range contains only minor tweaks for the most part.
gtest r500 is interesting:
http://code.google.com/p/googletest/source/detail?spec=svn500&r=500
"Modifies handling of C++ exceptions in death tests to treat exceptions escaping them as failures."
This confuses to death tests in message_loop_unittest on Windows, MessageLoopTest::Crasher and MessageLoopTest::CrasherNasty. These two tests set the global SEH handler. gtest now uses a frame-level exception handler, which overrides this global handler. Hence, disable gtest's new death test behavior for base_unittests on windows.
This is to prepare a gmock roll to 359, which should improve
build speed on mac.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6580010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75972 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | base/test/test_suite.cc | 3 |
2 files changed, 5 insertions, 2 deletions
@@ -32,10 +32,10 @@ deps = { (Var("googlecode_url") % "open-vcdiff") + "/trunk@28", "src/testing/gtest": - (Var("googlecode_url") % "googletest") + "/trunk@492", + (Var("googlecode_url") % "googletest") + "/trunk@539", "src/testing/gmock": - "http://googlemock.googlecode.com/svn/trunk@300", + "http://googlemock.googlecode.com/svn/trunk@358", "src/third_party/angle": (Var("googlecode_url") % "angleproject") + "/trunk@562", diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc index 447a138a..42b5b90 100644 --- a/base/test/test_suite.cc +++ b/base/test/test_suite.cc @@ -49,6 +49,9 @@ class MaybeTestDisabler : public testing::EmptyTestEventListener { const char TestSuite::kStrictFailureHandling[] = "strict_failure_handling"; TestSuite::TestSuite(int argc, char** argv) { +#if defined(OS_WIN) + testing::GTEST_FLAG(catch_exceptions) = false; +#endif base::EnableTerminationOnHeapCorruption(); CommandLine::Init(argc, argv); testing::InitGoogleTest(&argc, argv); |