45 files changed, 65 insertions, 54 deletions
diff --git a/base/data/valgrind/DIRECTORY_MOVED b/base/data/valgrind/DIRECTORY_MOVED
new file mode 100644
index 0000000..96449fe
--- /dev/null
+++ b/base/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/chrome/test/data/valgrind/DIRECTORY_MOVED b/chrome/test/data/valgrind/DIRECTORY_MOVED
new file mode 100644
index 0000000..96449fe
--- /dev/null
+++ b/chrome/test/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/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/net/data/valgrind/DIRECTORY_MOVED b/net/data/valgrind/DIRECTORY_MOVED
new file mode 100644
index 0000000..96449fe
--- /dev/null
+++ b/net/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/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py
index 5961189..a9c71db 100755
--- a/tools/valgrind/chrome_tests.py
+++ b/tools/valgrind/chrome_tests.py
@@ -89,19 +89,6 @@ class ChromeTests:
 
   def _DefaultCommand(self, tool, module, exe=None, valgrind_test_args=None):
     '''Generates the default command array that most tests will use.'''
-    module_dir = os.path.join(self._source_dir, module)
-
-    # We need multiple data dirs, the current script directory and a module
-    # specific one. The global suppression file lives in our directory, and the
-    # module specific suppression file lives with the module.
-    self._data_dirs = [path_utils.ScriptDir()]
-
-    if module == "chrome":
-      # unfortunately, not all modules have the same directory structure
-      self._data_dirs.append(os.path.join(module_dir, "test", "data",
-                                          "valgrind"))
-    else:
-      self._data_dirs.append(os.path.join(module_dir, "data", "valgrind"))
 
     if not self._options.build_dir:
       if common.IsWine():
@@ -119,19 +106,21 @@ class ChromeTests:
           self._options.build_dir = FindNewestDir(dirs)
 
     cmd = list(self._command_preamble)
-    for directory in self._data_dirs:
-      tool_name = tool.ToolName();
-      suppression_file = os.path.join(directory,
-          "%s/suppressions.txt" % tool_name)
-      if os.path.exists(suppression_file):
-        cmd.append("--suppressions=%s" % suppression_file)
-      # Platform specific suppression
-      for suppression_platform in common.PlatformNames():
-        suppression_file_platform = \
-            os.path.join(directory,
-                '%s/suppressions_%s.txt' % (tool_name, suppression_platform))
-        if os.path.exists(suppression_file_platform):
-          cmd.append("--suppressions=%s" % suppression_file_platform)
+
+    # Find all suppressions matching the following pattern:
+    # tools/valgrind/TOOL/suppressions[_PLATFORM].txt
+    # and list them with --suppressions= prefix.
+    script_dir = path_utils.ScriptDir()
+    tool_name = tool.ToolName();
+    suppression_file = os.path.join(script_dir, tool_name, "suppressions.txt")
+    if os.path.exists(suppression_file):
+      cmd.append("--suppressions=%s" % suppression_file)
+    # Platform-specific suppression
+    for platform in common.PlatformNames():
+      platform_suppression_file = \
+          os.path.join(script_dir, tool_name, 'suppressions_%s.txt' % platform)
+      if os.path.exists(platform_suppression_file):
+        cmd.append("--suppressions=%s" % platform_suppression_file)
 
     if self._options.valgrind_tool_flags:
       cmd += self._options.valgrind_tool_flags.split(" ")
@@ -160,34 +149,36 @@ class ChromeTests:
     and append the command-line option to cmd.
     '''
     filters = []
-    for directory in self._data_dirs:
-      gtest_filter_files = [
-          os.path.join(directory, name + ".gtest.txt"),
-          os.path.join(directory, name + ".gtest-%s.txt" % \
-              tool.ToolName())]
-      for platform_suffix in common.PlatformNames():
-        gtest_filter_files += [
-          os.path.join(directory, name + ".gtest_%s.txt" % platform_suffix),
-          os.path.join(directory, name + ".gtest-%s_%s.txt" % \
-              (tool.ToolName(), platform_suffix))]
-      for filename in gtest_filter_files:
-        if os.path.exists(filename):
-          logging.info("reading gtest filters from %s" % filename)
-          f = open(filename, 'r')
-          for line in f.readlines():
-            if line.startswith("#") or line.startswith("//") or line.isspace():
-              continue
-            line = line.rstrip()
-            test_prefixes = ["FLAKY", "FAILS"]
-            for p in test_prefixes:
-              # Strip prefixes from the test names.
-              line = line.replace(".%s_" % p, ".")
-            # Exclude the original test name.
-            filters.append(line)
-            if line[-2:] != ".*":
-              # List all possible prefixes if line doesn't end with ".*".
-              for p in test_prefixes:
-                filters.append(line.replace(".", ".%s_" % p))
+    gtest_files_dir = os.path.join(path_utils.ScriptDir(), "gtest_exclude")
+
+    gtest_filter_files = [
+        os.path.join(gtest_files_dir, name + ".gtest.txt"),
+        os.path.join(gtest_files_dir, name + ".gtest-%s.txt" % tool.ToolName())]
+    for platform_suffix in common.PlatformNames():
+      gtest_filter_files += [
+        os.path.join(gtest_files_dir, name + ".gtest_%s.txt" % platform_suffix),
+        os.path.join(gtest_files_dir, name + ".gtest-%s_%s.txt" % \
+            (tool.ToolName(), platform_suffix))]
+    for filename in gtest_filter_files:
+      if not os.path.exists(filename):
+        logging.info("gtest filter file %s not found - skipping" % filename)
+        continue
+      logging.info("Reading gtest filters from %s" % filename)
+      f = open(filename, 'r')
+      for line in f.readlines():
+        if line.startswith("#") or line.startswith("//") or line.isspace():
+          continue
+        line = line.rstrip()
+        test_prefixes = ["FLAKY", "FAILS"]
+        for p in test_prefixes:
+          # Strip prefixes from the test names.
+          line = line.replace(".%s_" % p, ".")
+        # Exclude the original test name.
+        filters.append(line)
+        if line[-2:] != ".*":
+          # List all possible prefixes if line doesn't end with ".*".
+          for p in test_prefixes:
+            filters.append(line.replace(".", ".%s_" % p))
     # Get rid of duplicates.
     filters = set(filters)
     gtest_filter = self._gtest_filter
diff --git a/chrome/test/data/valgrind/app_unittests.gtest-tsan.txt b/tools/valgrind/gtest_exclude/app_unittests.gtest-tsan.txt
index 64383b7..64383b7 100644
--- a/chrome/test/data/valgrind/app_unittests.gtest-tsan.txt
+++ b/tools/valgrind/gtest_exclude/app_unittests.gtest-tsan.txt
diff --git a/base/data/valgrind/base_unittests.gtest-drmemory_win32.txt b/tools/valgrind/gtest_exclude/base_unittests.gtest-drmemory_win32.txt
index b73fa61..b73fa61 100644
--- a/base/data/valgrind/base_unittests.gtest-drmemory_win32.txt
+++ b/tools/valgrind/gtest_exclude/base_unittests.gtest-drmemory_win32.txt
diff --git a/base/data/valgrind/base_unittests.gtest-tsan.txt b/tools/valgrind/gtest_exclude/base_unittests.gtest-tsan.txt
index 1f81bea..1f81bea 100644
--- a/base/data/valgrind/base_unittests.gtest-tsan.txt
+++ b/tools/valgrind/gtest_exclude/base_unittests.gtest-tsan.txt
diff --git a/base/data/valgrind/base_unittests.gtest-tsan_mac.txt b/tools/valgrind/gtest_exclude/base_unittests.gtest-tsan_mac.txt
index 7ee06a1..7ee06a1 100644
--- a/base/data/valgrind/base_unittests.gtest-tsan_mac.txt
+++ b/tools/valgrind/gtest_exclude/base_unittests.gtest-tsan_mac.txt
diff --git a/base/data/valgrind/base_unittests.gtest-tsan_win32.txt b/tools/valgrind/gtest_exclude/base_unittests.gtest-tsan_win32.txt
index 0207c09..0207c09 100644
--- a/base/data/valgrind/base_unittests.gtest-tsan_win32.txt
+++ b/tools/valgrind/gtest_exclude/base_unittests.gtest-tsan_win32.txt
diff --git a/base/data/valgrind/base_unittests.gtest.txt b/tools/valgrind/gtest_exclude/base_unittests.gtest.txt
index 173defa..173defa 100644
--- a/base/data/valgrind/base_unittests.gtest.txt
+++ b/tools/valgrind/gtest_exclude/base_unittests.gtest.txt
diff --git a/base/data/valgrind/base_unittests.gtest_mac.txt b/tools/valgrind/gtest_exclude/base_unittests.gtest_mac.txt
index 46fbf47..46fbf47 100644
--- a/base/data/valgrind/base_unittests.gtest_mac.txt
+++ b/tools/valgrind/gtest_exclude/base_unittests.gtest_mac.txt
diff --git a/base/data/valgrind/base_unittests.gtest_win32.txt b/tools/valgrind/gtest_exclude/base_unittests.gtest_win32.txt
index 525648c..525648c 100644
--- a/base/data/valgrind/base_unittests.gtest_win32.txt
+++ b/tools/valgrind/gtest_exclude/base_unittests.gtest_win32.txt
diff --git a/base/data/valgrind/base_unittests.gtest_wine.txt b/tools/valgrind/gtest_exclude/base_unittests.gtest_wine.txt
index 17d3085..17d3085 100644
--- a/base/data/valgrind/base_unittests.gtest_wine.txt
+++ b/tools/valgrind/gtest_exclude/base_unittests.gtest_wine.txt
diff --git a/ipc/data/valgrind/ipc_tests.gtest-drmemory_win32.txt b/tools/valgrind/gtest_exclude/ipc_tests.gtest-drmemory_win32.txt
index ac62a9a..ac62a9a 100644
--- a/ipc/data/valgrind/ipc_tests.gtest-drmemory_win32.txt
+++ b/tools/valgrind/gtest_exclude/ipc_tests.gtest-drmemory_win32.txt
diff --git a/ipc/data/valgrind/ipc_tests.gtest.txt b/tools/valgrind/gtest_exclude/ipc_tests.gtest.txt
index 30a1f89..30a1f89 100644
--- a/ipc/data/valgrind/ipc_tests.gtest.txt
+++ b/tools/valgrind/gtest_exclude/ipc_tests.gtest.txt
diff --git a/chrome/test/data/valgrind/media_unittests.gtest-drmemory_win32.txt b/tools/valgrind/gtest_exclude/media_unittests.gtest-drmemory_win32.txt
index df5f284..df5f284 100644
--- a/chrome/test/data/valgrind/media_unittests.gtest-drmemory_win32.txt
+++ b/tools/valgrind/gtest_exclude/media_unittests.gtest-drmemory_win32.txt
diff --git a/chrome/test/data/valgrind/media_unittests.gtest-tsan_win32.txt b/tools/valgrind/gtest_exclude/media_unittests.gtest-tsan_win32.txt
index e69de29..e69de29 100644
--- a/chrome/test/data/valgrind/media_unittests.gtest-tsan_win32.txt
+++ b/tools/valgrind/gtest_exclude/media_unittests.gtest-tsan_win32.txt
diff --git a/chrome/test/data/valgrind/media_unittests.gtest.txt b/tools/valgrind/gtest_exclude/media_unittests.gtest.txt
index 7e22249..7e22249 100644
--- a/chrome/test/data/valgrind/media_unittests.gtest.txt
+++ b/tools/valgrind/gtest_exclude/media_unittests.gtest.txt
diff --git a/chrome/test/data/valgrind/media_unittests.gtest_mac.txt b/tools/valgrind/gtest_exclude/media_unittests.gtest_mac.txt
index e69de29..e69de29 100644
--- a/chrome/test/data/valgrind/media_unittests.gtest_mac.txt
+++ b/tools/valgrind/gtest_exclude/media_unittests.gtest_mac.txt
diff --git a/net/data/valgrind/net_unittests.gtest-drmemory_win32.txt b/tools/valgrind/gtest_exclude/net_unittests.gtest-drmemory_win32.txt
index 10b8617..10b8617 100644
--- a/net/data/valgrind/net_unittests.gtest-drmemory_win32.txt
+++ b/tools/valgrind/gtest_exclude/net_unittests.gtest-drmemory_win32.txt
diff --git a/net/data/valgrind/net_unittests.gtest-memcheck.txt b/tools/valgrind/gtest_exclude/net_unittests.gtest-memcheck.txt
index e7f42dd..e7f42dd 100644
--- a/net/data/valgrind/net_unittests.gtest-memcheck.txt
+++ b/tools/valgrind/gtest_exclude/net_unittests.gtest-memcheck.txt
diff --git a/net/data/valgrind/net_unittests.gtest-tsan.txt b/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan.txt
index 1ddf884..1ddf884 100644
--- a/net/data/valgrind/net_unittests.gtest-tsan.txt
+++ b/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan.txt
diff --git a/net/data/valgrind/net_unittests.gtest-tsan_mac.txt b/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan_mac.txt
index 6359e4b..6359e4b 100644
--- a/net/data/valgrind/net_unittests.gtest-tsan_mac.txt
+++ b/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan_mac.txt
diff --git a/net/data/valgrind/net_unittests.gtest-tsan_win32.txt b/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan_win32.txt
index b7b6e2c..b7b6e2c 100644
--- a/net/data/valgrind/net_unittests.gtest-tsan_win32.txt
+++ b/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan_win32.txt
diff --git a/net/data/valgrind/net_unittests.gtest.txt b/tools/valgrind/gtest_exclude/net_unittests.gtest.txt
index 0af617c..0af617c 100644
--- a/net/data/valgrind/net_unittests.gtest.txt
+++ b/tools/valgrind/gtest_exclude/net_unittests.gtest.txt
diff --git a/net/data/valgrind/net_unittests.gtest_linux.txt b/tools/valgrind/gtest_exclude/net_unittests.gtest_linux.txt
index 1b69eec..1b69eec 100644
--- a/net/data/valgrind/net_unittests.gtest_linux.txt
+++ b/tools/valgrind/gtest_exclude/net_unittests.gtest_linux.txt
diff --git a/net/data/valgrind/net_unittests.gtest_mac.txt b/tools/valgrind/gtest_exclude/net_unittests.gtest_mac.txt
index 57f2365..57f2365 100644
--- a/net/data/valgrind/net_unittests.gtest_mac.txt
+++ b/tools/valgrind/gtest_exclude/net_unittests.gtest_mac.txt
diff --git a/net/data/valgrind/net_unittests.gtest_wine.txt b/tools/valgrind/gtest_exclude/net_unittests.gtest_wine.txt
index 2492f86..2492f86 100644
--- a/net/data/valgrind/net_unittests.gtest_wine.txt
+++ b/tools/valgrind/gtest_exclude/net_unittests.gtest_wine.txt
diff --git a/chrome/test/data/valgrind/remoting_unittests.gtest-tsan_win32.txt b/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan_win32.txt
index b5d078d..b5d078d 100644
--- a/chrome/test/data/valgrind/remoting_unittests.gtest-tsan_win32.txt
+++ b/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan_win32.txt
diff --git a/net/data/valgrind/suppressions.txt b/tools/valgrind/gtest_exclude/suppressions.txt
index e8cc210..e8cc210 100644
--- a/net/data/valgrind/suppressions.txt
+++ b/tools/valgrind/gtest_exclude/suppressions.txt
diff --git a/chrome/test/data/valgrind/sync_unit_tests.gtest-tsan.txt b/tools/valgrind/gtest_exclude/sync_unit_tests.gtest-tsan.txt
index e69de29..e69de29 100644
--- a/chrome/test/data/valgrind/sync_unit_tests.gtest-tsan.txt
+++ b/tools/valgrind/gtest_exclude/sync_unit_tests.gtest-tsan.txt
diff --git a/webkit/data/valgrind/test_shell_tests.gtest.txt b/tools/valgrind/gtest_exclude/test_shell_tests.gtest.txt
index 10119a0..10119a0 100644
--- a/webkit/data/valgrind/test_shell_tests.gtest.txt
+++ b/tools/valgrind/gtest_exclude/test_shell_tests.gtest.txt
diff --git a/chrome/test/data/valgrind/ui_tests.gtest-tsan.txt b/tools/valgrind/gtest_exclude/ui_tests.gtest-tsan.txt
index e1a07ab..e1a07ab 100644
--- a/chrome/test/data/valgrind/ui_tests.gtest-tsan.txt
+++ b/tools/valgrind/gtest_exclude/ui_tests.gtest-tsan.txt
diff --git a/chrome/test/data/valgrind/ui_tests.gtest-tsan_mac.txt b/tools/valgrind/gtest_exclude/ui_tests.gtest-tsan_mac.txt
index 72d1195..72d1195 100644
--- a/chrome/test/data/valgrind/ui_tests.gtest-tsan_mac.txt
+++ b/tools/valgrind/gtest_exclude/ui_tests.gtest-tsan_mac.txt
diff --git a/chrome/test/data/valgrind/ui_tests.gtest.txt b/tools/valgrind/gtest_exclude/ui_tests.gtest.txt
index 338da2e..338da2e 100644
--- a/chrome/test/data/valgrind/ui_tests.gtest.txt
+++ b/tools/valgrind/gtest_exclude/ui_tests.gtest.txt
diff --git a/chrome/test/data/valgrind/ui_tests.gtest_linux.txt b/tools/valgrind/gtest_exclude/ui_tests.gtest_linux.txt
index 523e55b..523e55b 100644
--- a/chrome/test/data/valgrind/ui_tests.gtest_linux.txt
+++ b/tools/valgrind/gtest_exclude/ui_tests.gtest_linux.txt
diff --git a/chrome/test/data/valgrind/ui_tests.gtest_mac.txt b/tools/valgrind/gtest_exclude/ui_tests.gtest_mac.txt
index fa6748a..fa6748a 100644
--- a/chrome/test/data/valgrind/ui_tests.gtest_mac.txt
+++ b/tools/valgrind/gtest_exclude/ui_tests.gtest_mac.txt
diff --git a/chrome/test/data/valgrind/unit_tests.gtest-tsan.txt b/tools/valgrind/gtest_exclude/unit_tests.gtest-tsan.txt
index a05d51f..a05d51f 100644
--- a/chrome/test/data/valgrind/unit_tests.gtest-tsan.txt
+++ b/tools/valgrind/gtest_exclude/unit_tests.gtest-tsan.txt
diff --git a/chrome/test/data/valgrind/unit_tests.gtest-tsan_mac.txt b/tools/valgrind/gtest_exclude/unit_tests.gtest-tsan_mac.txt
index 20563c7..20563c7 100644
--- a/chrome/test/data/valgrind/unit_tests.gtest-tsan_mac.txt
+++ b/tools/valgrind/gtest_exclude/unit_tests.gtest-tsan_mac.txt
diff --git a/chrome/test/data/valgrind/unit_tests.gtest.txt b/tools/valgrind/gtest_exclude/unit_tests.gtest.txt
index cd41df9..cd41df9 100644
--- a/chrome/test/data/valgrind/unit_tests.gtest.txt
+++ b/tools/valgrind/gtest_exclude/unit_tests.gtest.txt
diff --git a/chrome/test/data/valgrind/unit_tests.gtest_linux.txt b/tools/valgrind/gtest_exclude/unit_tests.gtest_linux.txt
index baba59f..baba59f 100644
--- a/chrome/test/data/valgrind/unit_tests.gtest_linux.txt
+++ b/tools/valgrind/gtest_exclude/unit_tests.gtest_linux.txt
diff --git a/chrome/test/data/valgrind/unit_tests.gtest_mac.txt b/tools/valgrind/gtest_exclude/unit_tests.gtest_mac.txt
index 2e4e660..2e4e660 100644
--- a/chrome/test/data/valgrind/unit_tests.gtest_mac.txt
+++ b/tools/valgrind/gtest_exclude/unit_tests.gtest_mac.txt
diff --git a/chrome/test/data/valgrind/unit_tests.gtest_wine.txt b/tools/valgrind/gtest_exclude/unit_tests.gtest_wine.txt
index 75becc1..75becc1 100644
--- a/chrome/test/data/valgrind/unit_tests.gtest_wine.txt
+++ b/tools/valgrind/gtest_exclude/unit_tests.gtest_wine.txt
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