diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 18:08:51 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 18:08:51 +0000 |
| commit | d2e850441e3a7b54cf201b9a494a2e6c8bf69cd7 (patch) | |
| tree | 6b86645d825e018f86c3431fb2e8a82a9456ed0e /base/test/test_suite.cc | |
| parent | 4321582288e8acc47b8bf581a899904db2d90b77 (diff) | |
| download | chromium_src-d2e850441e3a7b54cf201b9a494a2e6c8bf69cd7.zip chromium_src-d2e850441e3a7b54cf201b9a494a2e6c8bf69cd7.tar.gz chromium_src-d2e850441e3a7b54cf201b9a494a2e6c8bf69cd7.tar.bz2 | |
GTTF: Fix cc_unittests ignoring gtest_filter with new test launcher.
BUG=299200, 236893
R=danakj@chromium.org, jamesr@chromium.org
Review URL: https://codereview.chromium.org/70943002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235184 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/test/test_suite.cc')
| -rw-r--r-- | base/test/test_suite.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc index 9d7c158..32b79f3 100644 --- a/base/test/test_suite.cc +++ b/base/test/test_suite.cc @@ -23,6 +23,7 @@ #include "base/test/test_switches.h" #include "base/test/test_timeouts.h" #include "base/time/time.h" +#include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/multiprocess_func_list.h" @@ -104,6 +105,7 @@ void TestSuite::PreInitialize(int argc, char** argv, base::EnableTerminationOnHeapCorruption(); initialized_command_line_ = CommandLine::Init(argc, argv); testing::InitGoogleTest(&argc, argv); + testing::InitGoogleMock(&argc, argv); #if defined(OS_LINUX) && defined(USE_AURA) // When calling native char conversion functions (e.g wrctomb) we need to // have the locale set. In the absence of such a call the "C" locale is the |