diff options
author | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-04 01:44:57 +0000 |
---|---|---|
committer | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-04 01:44:57 +0000 |
commit | 04f70572887672c0457d8d4f58eb19a5297d1e8d (patch) | |
tree | f0d96a36f21ea9e6e58b6fb724e1e9d73e510cef | |
parent | e107c3f46ed8a45ff314bff3113528a919cd4a11 (diff) | |
download | chromium_src-04f70572887672c0457d8d4f58eb19a5297d1e8d.zip chromium_src-04f70572887672c0457d8d4f58eb19a5297d1e8d.tar.gz chromium_src-04f70572887672c0457d8d4f58eb19a5297d1e8d.tar.bz2 |
Enable ConnectionTesterTest.RunAllTests in everything but valgrind.
BUG=50950
TEST=None
Review URL: http://codereview.chromium.org/3082017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54859 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/net/connection_tester_unittest.cc | 4 | ||||
-rw-r--r-- | chrome/test/data/valgrind/unit_tests.gtest.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/net/connection_tester_unittest.cc b/chrome/browser/net/connection_tester_unittest.cc index c1d7863..01a0345 100644 --- a/chrome/browser/net/connection_tester_unittest.cc +++ b/chrome/browser/net/connection_tester_unittest.cc @@ -86,9 +86,7 @@ class ConnectionTesterTest : public PlatformTest { MessageLoop message_loop_; }; -// Disabled sunce Mac Valgrind crashes with pure virtual member being called. -// http://crbug.com/50950 -TEST_F(ConnectionTesterTest, DISABLED_RunAllTests) { +TEST_F(ConnectionTesterTest, RunAllTests) { scoped_refptr<net::HTTPTestServer> server = net::HTTPTestServer::CreateServer(L"net/data/url_request_unittest/"); diff --git a/chrome/test/data/valgrind/unit_tests.gtest.txt b/chrome/test/data/valgrind/unit_tests.gtest.txt index 6cfc18e..f5d999d 100644 --- a/chrome/test/data/valgrind/unit_tests.gtest.txt +++ b/chrome/test/data/valgrind/unit_tests.gtest.txt @@ -6,3 +6,5 @@ VisitedLinkRelayTest.Basics RenderViewTest.ImeComposition # Hangs sometimes; see http://crbug.com/24416 DnsMasterTest.MassiveConcurrentLookupTest +# Pure virtual method called: see http://crbug.com/50950 +ConnectionTesterTest.RunAllTests |