diff options
| author | timurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-17 11:08:08 +0000 |
|---|---|---|
| committer | timurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-17 11:08:08 +0000 |
| commit | cc1081197aaeae9d3c7d7a88ec06f6e9acdc4145 (patch) | |
| tree | 08866eb3ac9d7d65e4e14ddc35dd38f44664a442 /net | |
| parent | a9c0bfe7d2d3f58cb5844c7470578327a55e4536 (diff) | |
| download | chromium_src-cc1081197aaeae9d3c7d7a88ec06f6e9acdc4145.zip chromium_src-cc1081197aaeae9d3c7d7a88ec06f6e9acdc4145.tar.gz chromium_src-cc1081197aaeae9d3c7d7a88ec06f6e9acdc4145.tar.bz2 | |
Annotate test-only race in DiskCacheBackendTest.NewEvictionTrimInvalidEntry
also remove the suppressions which won't be needed anymore.
Also remove suppression for an old bug 30960 fixed long ago.
BUG=55970,30960
TBR=rvargas
TEST=trybots, TSan
Review URL: http://codereview.chromium.org/3416009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/disk_cache/backend_unittest.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/disk_cache/backend_unittest.cc b/net/disk_cache/backend_unittest.cc index 57c3187..a6cd2d2 100644 --- a/net/disk_cache/backend_unittest.cc +++ b/net/disk_cache/backend_unittest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/basictypes.h" +#include "base/third_party/dynamic_annotations/dynamic_annotations.h" #include "base/file_util.h" #include "base/platform_thread.h" #include "base/string_util.h" @@ -713,7 +714,14 @@ void DiskCacheBackendTest::BackendTrimInvalidEntry() { // if it took more than that, we posted a task and we'll delete the second // entry too. MessageLoop::current()->RunAllPending(); + + // This may be not thread-safe in general, but for now it's OK so add some + // ThreadSanitizer annotations to ignore data races on cache_. + // See http://crbug.com/55970 + ANNOTATE_IGNORE_READS_BEGIN(); EXPECT_GE(1, cache_->GetEntryCount()); + ANNOTATE_IGNORE_READS_END(); + EXPECT_NE(net::OK, OpenEntry(first, &entry)); } |