summaryrefslogtreecommitdiffstats
path: root/ipc/data/valgrind
diff options
context:
space:
mode:
Diffstat (limited to 'ipc/data/valgrind')
-rw-r--r--ipc/data/valgrind/DIRECTORY_MOVED4
-rw-r--r--ipc/data/valgrind/ipc_tests.gtest-drmemory_win32.txt2
-rw-r--r--ipc/data/valgrind/ipc_tests.gtest.txt6
3 files changed, 4 insertions, 8 deletions
diff --git a/ipc/data/valgrind/DIRECTORY_MOVED b/ipc/data/valgrind/DIRECTORY_MOVED
new file mode 100644
index 0000000..96449fe
--- /dev/null
+++ b/ipc/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/ipc/data/valgrind/ipc_tests.gtest-drmemory_win32.txt b/ipc/data/valgrind/ipc_tests.gtest-drmemory_win32.txt
deleted file mode 100644
index ac62a9a..0000000
--- a/ipc/data/valgrind/ipc_tests.gtest-drmemory_win32.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# TODO(timurrrr): investigate
-IPCSyncChannelTest.*
diff --git a/ipc/data/valgrind/ipc_tests.gtest.txt b/ipc/data/valgrind/ipc_tests.gtest.txt
deleted file mode 100644
index 30a1f89..0000000
--- a/ipc/data/valgrind/ipc_tests.gtest.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# Takes 27-40 seconds to run.
-IPCSyncChannelTest.ChattyServer
-# Hangs on Linux sometimes. See http://crbug.com/22141
-IPCChannelTest.ChannelTest
-# Crashes under Valgrind. See http://crbug.com/46782
-IPCSyncChannelTest.Multiple