summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_tabs_apitest.cc
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-04 09:35:16 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-04 09:35:16 +0000
commit791278e473dc5fe7b9dc39e78e5e7ad8ad4f0cef (patch)
treec3cb7d2e5810b294b8bcd5bb6f5990a67a684108 /chrome/browser/extensions/extension_tabs_apitest.cc
parent87c0dc5a27565e74f6063d27ab70f17680d4ffba (diff)
downloadchromium_src-791278e473dc5fe7b9dc39e78e5e7ad8ad4f0cef.zip
chromium_src-791278e473dc5fe7b9dc39e78e5e7ad8ad4f0cef.tar.gz
chromium_src-791278e473dc5fe7b9dc39e78e5e7ad8ad4f0cef.tar.bz2
Disable ExtensionApiTest.Tabs on Mac.
TEST=no random redness on Mac OS X 10.6 bot BUG=37387 TBR=skerner@ git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40616 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_tabs_apitest.cc')
-rw-r--r--chrome/browser/extensions/extension_tabs_apitest.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc
index 7ab30b4..9931c92 100644
--- a/chrome/browser/extensions/extension_tabs_apitest.cc
+++ b/chrome/browser/extensions/extension_tabs_apitest.cc
@@ -9,8 +9,9 @@
#include "chrome/browser/profile.h"
#include "chrome/common/pref_names.h"
-// TODO(skerner): This test is flaky in chromeos. Figure out why and fix.
-#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
+// TODO(skerner): This test is flaky in chromeos and on Mac OS X 10.6. Figure
+// out why and fix.
+#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(OS_MACOSX)
#define MAYBE_Tabs DISABLED_Tabs
#else
#define MAYBE_Tabs Tabs