summaryrefslogtreecommitdiffstats
path: root/webkit/data
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/data')
-rw-r--r--webkit/data/valgrind/DIRECTORY_MOVED4
-rw-r--r--webkit/data/valgrind/test_shell_tests.gtest.txt8
2 files changed, 4 insertions, 8 deletions
diff --git a/webkit/data/valgrind/DIRECTORY_MOVED b/webkit/data/valgrind/DIRECTORY_MOVED
new file mode 100644
index 0000000..96449fe
--- /dev/null
+++ b/webkit/data/valgrind/DIRECTORY_MOVED
@@ -0,0 +1,4 @@
+For those who got a merge conflict in this directory on update:
+The files from this dir has been moved to tools/valgrind/gtest_exclude
+
+TODO(timurrrr): remove this in a couple of weeks
diff --git a/webkit/data/valgrind/test_shell_tests.gtest.txt b/webkit/data/valgrind/test_shell_tests.gtest.txt
deleted file mode 100644
index 10119a0..0000000
--- a/webkit/data/valgrind/test_shell_tests.gtest.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Way too slow under Valgrind at the moment; http://crbug.com/9177
-BMPImageDecoderTest.ChunkedDecodingSlow
-BMPImageDecoderTest.DecodingSlow
-# hangs; see http://crbug.com/16945
-MediaLeakTest.VideoBear
-MediaLeakTest.ManyVideoBear
-# hangs; see http://crbug.com/22134
-WebFrameTest.GetFullHtmlOfPage