summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-02 15:55:45 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-02 15:55:45 +0000
commit9d86cf75b1e720979b71b8943e7cd68e9687a981 (patch)
tree666d92ac3acfb007f16af2dc5f9f41f38303c379 /base
parent2ff94fdf547169086f91a86cbbf7e1accedadd5f (diff)
downloadchromium_src-9d86cf75b1e720979b71b8943e7cd68e9687a981.zip
chromium_src-9d86cf75b1e720979b71b8943e7cd68e9687a981.tar.gz
chromium_src-9d86cf75b1e720979b71b8943e7cd68e9687a981.tar.bz2
Mark SharedMemoryProcessTest.Tasks as flaky on Mac.
BUG=61589 TEST=SharedMemoryProcessTest.Tasks Review URL: http://codereview.chromium.org/4228003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64749 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/shared_memory_unittest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/base/shared_memory_unittest.cc b/base/shared_memory_unittest.cc
index f7036e8..f646158 100644
--- a/base/shared_memory_unittest.cc
+++ b/base/shared_memory_unittest.cc
@@ -371,7 +371,13 @@ class SharedMemoryProcessTest : public base::MultiProcessTest {
const char* const SharedMemoryProcessTest::s_test_name_ = "MPMem";
-TEST_F(SharedMemoryProcessTest, Tasks) {
+#if defined(OS_MACOSX)
+#define MAYBE_Tasks FLAKY_Tasks
+#else
+#define MAYBE_Tasks Tasks
+#endif
+
+TEST_F(SharedMemoryProcessTest, MAYBE_Tasks) {
SharedMemoryProcessTest::CleanUp();
base::ProcessHandle handles[kNumTasks];