diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 01:11:37 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 01:11:37 +0000 |
| commit | d19d40d46917d7f347d1acd1517d162fb080755e (patch) | |
| tree | b6c40b348fb2367670046cbcd41bba1fbd10cc82 /net/cert/multi_threaded_cert_verifier_unittest.cc | |
| parent | bece1565f412f065e73448c5e337dbb76b33bf96 (diff) | |
| download | chromium_src-d19d40d46917d7f347d1acd1517d162fb080755e.zip chromium_src-d19d40d46917d7f347d1acd1517d162fb080755e.tar.gz chromium_src-d19d40d46917d7f347d1acd1517d162fb080755e.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/cert/multi_threaded_cert_verifier_unittest.cc')
| -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")); |