summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorearthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-14 12:51:37 +0000
committerearthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-14 12:51:37 +0000
commit70cc2c741a306fa829f73aa1833d73bd743746df (patch)
tree6d8c57738744ca3ced0779d5ce17497702ea150b
parent85bbf7241198fb58559786fc447c507dc47406f7 (diff)
downloadchromium_src-70cc2c741a306fa829f73aa1833d73bd743746df.zip
chromium_src-70cc2c741a306fa829f73aa1833d73bd743746df.tar.gz
chromium_src-70cc2c741a306fa829f73aa1833d73bd743746df.tar.bz2
Suppress a Valgrind error and disable a test under HeapChecker.
BUG=315883, 319242 TBR=oshima@chromium.org Review URL: https://codereview.chromium.org/72713002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235129 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--tools/heapcheck/ash_unittests.gtest-heapcheck.txt2
-rw-r--r--tools/valgrind/memcheck/suppressions.txt14
2 files changed, 16 insertions, 0 deletions
diff --git a/tools/heapcheck/ash_unittests.gtest-heapcheck.txt b/tools/heapcheck/ash_unittests.gtest-heapcheck.txt
new file mode 100644
index 0000000..c645144
--- /dev/null
+++ b/tools/heapcheck/ash_unittests.gtest-heapcheck.txt
@@ -0,0 +1,2 @@
+# Crashes - http://crbug.com/315883
+DragDropControllerTest.TouchDragDropInMultipleWindows
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index dc0d2c9..90d33dc 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -6424,3 +6424,17 @@
fun:_ZN5media16AudioOutputProxy4OpenEv
fun:_ZN5media18AudioStreamHandler20AudioStreamContainer4PlayEv
}
+{
+ bug_319242_a
+ Memcheck:Uninitialized
+ fun:_ZN7testing8internal11TuplePrefixILm2EE7Matches*
+ ...
+ fun:_ZN5media16AesDecryptorTest8KeyErrorEjNS_9MediaKeys8KeyErrorEi
+}
+{
+ bug_319242_b
+ Memcheck:Uninitialized
+ fun:_ZNK7testing8internal16TypedExpectationIFvjEE7Matches*
+ ...
+ fun:_ZN5media16AesDecryptorTest8KeyAddedEj
+}