Skip to content

Commit

Permalink
Roll gtest 492:539 and gmock 300:358
Browse files Browse the repository at this point in the history
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
  • Loading branch information
thakis@chromium.org committed Feb 24, 2011
1 parent cd6d6d5 commit ba61ec6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
4 changes: 2 additions & 2 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions base/test/test_suite.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit ba61ec6

Please sign in to comment.