4 files changed, 20 insertions, 12 deletions
diff --git a/chrome/test/data/valgrind/unit_tests.gtest.txt b/chrome/test/data/valgrind/unit_tests.gtest.txt
index e76278f..3f75f25 100644
--- a/chrome/test/data/valgrind/unit_tests.gtest.txt
+++ b/chrome/test/data/valgrind/unit_tests.gtest.txt
@@ -1,5 +1,2 @@
 # Takes 65 seconds to run.
 IPCSyncChannelTest.ChattyServer
-# See http://crbug.com/15445
-# Only fails on the bots?
-BookmarkEditorGtkTest.*
diff --git a/chrome/test/data/valgrind/unit_tests.gtest_linux.txt b/chrome/test/data/valgrind/unit_tests.gtest_linux.txt
new file mode 100644
index 0000000..b78da34
--- /dev/null
+++ b/chrome/test/data/valgrind/unit_tests.gtest_linux.txt
@@ -0,0 +1,3 @@
+# See http://crbug.com/15445
+# Only fails on the bots?
+BookmarkEditorGtkTest.*
diff --git a/chrome/test/data/valgrind/unit_tests.gtest_mac.txt b/chrome/test/data/valgrind/unit_tests.gtest_mac.txt
new file mode 100644
index 0000000..db04a32
--- /dev/null
+++ b/chrome/test/data/valgrind/unit_tests.gtest_mac.txt
@@ -0,0 +1,3 @@
+# Times out too often
+# crbug.com/15817
+IPCSyncChannelTest.*
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py
index 1417c9f..2d9f6f6 100755
--- a/tools/valgrind/chrome_tests.py
+++ b/tools/valgrind/chrome_tests.py
@@ -188,15 +188,20 @@ class ChromeTests:
     '''
     filters = []
     for directory in self._data_dirs:
-      filename = os.path.join(directory, name + ".gtest.txt")
-      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()
-          filters.append(line)
+      platform_suffix = {'darwin': 'mac',
+                         'linux2': 'linux'}[sys.platform]
+      gtest_filter_files = [
+          os.path.join(directory, name + ".gtest.txt"),
+          os.path.join(directory, name + ".gtest_%s.txt" % 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()
+            filters.append(line)
     gtest_filter = self._options.gtest_filter
     if len(filters):
       if gtest_filter: