diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 12:54:37 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 12:54:37 +0000 |
| commit | 1736fed9e87ba4e1e2a28865894f4c5ef849086f (patch) | |
| tree | 31421e9f2b024ea86a937ce521fa621086487156 /net/cert | |
| parent | 803ac6bd6d3478d80adeb5ddb72b69c210fcf74d (diff) | |
| download | chromium_src-1736fed9e87ba4e1e2a28865894f4c5ef849086f.zip chromium_src-1736fed9e87ba4e1e2a28865894f4c5ef849086f.tar.gz chromium_src-1736fed9e87ba4e1e2a28865894f4c5ef849086f.tar.bz2 | |
Revert 226978 "Revert 226920 "Roll Clang 188423:191856.""
> Revert 226920 "Roll Clang 188423:191856."
>
> I suspect this caused a 25% sizes regression on Mac: http://build.chromium.org/f/chromium/perf/mac-release/sizes/report.html?history=150&rev=-1&graph=Chromium.app
>
> > Roll Clang 188423:191856.
> >
> > Remove libprofile_rt from package.sh, it doesn't exist after LLVM r191835
> >
> > BUG=290204,303886
> > R=thakis@chromium.org
> > TBR=net owner
> > NOTRY=true
> >
> > Review URL: https://codereview.chromium.org/25875004
>
> TBR=thakis@chromium.org
>
> Review URL: https://codereview.chromium.org/25988002
TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/25999003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226994 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/cert')
| -rw-r--r-- | net/cert/multi_threaded_cert_verifier_unittest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/cert/multi_threaded_cert_verifier_unittest.cc b/net/cert/multi_threaded_cert_verifier_unittest.cc index 17d23d3..3a0c765 100644 --- a/net/cert/multi_threaded_cert_verifier_unittest.cc +++ b/net/cert/multi_threaded_cert_verifier_unittest.cc @@ -279,7 +279,13 @@ TEST_F(MultiThreadedCertVerifierTest, CancelRequest) { } // Tests that a canceled request is not leaked. -TEST_F(MultiThreadedCertVerifierTest, CancelRequestThenQuit) { +#if !defined(LEAK_SANITIZER) +#define MAYBE_CancelRequestThenQuit CancelRequestThenQuit +#else +// See PR303886. LeakSanitizer flags a leak here. +#define MAYBE_CancelRequestThenQuit DISABLED_CancelRequestThenQuit +#endif +TEST_F(MultiThreadedCertVerifierTest, MAYBE_CancelRequestThenQuit) { base::FilePath certs_dir = GetTestCertsDirectory(); scoped_refptr<X509Certificate> test_cert( ImportCertFromFile(certs_dir, "ok_cert.pem")); |