diff options
| author | miu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 10:33:27 +0000 |
|---|---|---|
| committer | miu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 10:33:27 +0000 |
| commit | c2074d374cde8a4e083ff7520ad2e47cd178c56d (patch) | |
| tree | e2808b6c1c5d32e52381ef632cd32271a342bea7 /tools | |
| parent | 60e1f8512a1a88d7812171fdeb84c4954df365f3 (diff) | |
| download | chromium_src-c2074d374cde8a4e083ff7520ad2e47cd178c56d.zip chromium_src-c2074d374cde8a4e083ff7520ad2e47cd178c56d.tar.gz chromium_src-c2074d374cde8a4e083ff7520ad2e47cd178c56d.tar.bz2 | |
Fixed and re-enabled unit tests for WebContentsVideoCaptureDevice.
1. Added mechanism to synchronize unit test tear-down with objects being destroyed on other threads.
2. Added locking around StubRenderWidgetHost::color_ in test code.
3. Re-enabled tests and removed relevant suppressions.
BUG=158317
TEST=Ran TSAN and Heapcheck with no errors. Ran debug Chromium build with --vmodule=web_contents_video_capture_device=2 and confirmed no breakage in functionality.
Review URL: https://chromiumcodereview.appspot.com/11336027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165327 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/valgrind/gtest_exclude/content_unittests.gtest.txt | 3 | ||||
| -rw-r--r-- | tools/valgrind/tsan/suppressions.txt | 16 |
2 files changed, 0 insertions, 19 deletions
diff --git a/tools/valgrind/gtest_exclude/content_unittests.gtest.txt b/tools/valgrind/gtest_exclude/content_unittests.gtest.txt deleted file mode 100644 index 10791f2..0000000 --- a/tools/valgrind/gtest_exclude/content_unittests.gtest.txt +++ /dev/null @@ -1,3 +0,0 @@ -# These crash under TSan due to data races, might affect other tools as well. -# See http://crbug.com/158317 -WebContentsVideoCaptureDeviceTest.* diff --git a/tools/valgrind/tsan/suppressions.txt b/tools/valgrind/tsan/suppressions.txt index c9553bf..f2f8073 100644 --- a/tools/valgrind/tsan/suppressions.txt +++ b/tools/valgrind/tsan/suppressions.txt @@ -1000,19 +1000,3 @@ fun:safe_browsing::ClientSideDetectionHost::ShouldClassifyUrlRequest::CheckCsdWhitelist fun:base::internal::RunnableAdapter::Run } -{ - bug_158317_a - ThreadSanitizer:Race - ... - fun:content::::BackingStoreCopier::StartCopy - fun:base::internal::RunnableAdapter::Run -} -{ - bug_158317_b - ThreadSanitizer:Race - ... - fun:content::RenderWidgetHostImpl::~RenderWidgetHostImpl - fun:StubRenderWidgetHost::~StubRenderWidgetHost - fun:scoped_ptr::reset - fun:WebContentsVideoCaptureDeviceTest::TearDown -} |