summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/execute_script_apitest.cc
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-28 21:06:27 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-28 21:06:27 +0000
commit25acf3e504754223450ec08fc0c89a56ae030156 (patch)
treef75b1538d4016472fbe016190cc562d6ce50dd43 /chrome/browser/extensions/execute_script_apitest.cc
parent7228f89d0949bd948fb0ea57d1d505641d3420f4 (diff)
downloadchromium_src-25acf3e504754223450ec08fc0c89a56ae030156.zip
chromium_src-25acf3e504754223450ec08fc0c89a56ae030156.tar.gz
chromium_src-25acf3e504754223450ec08fc0c89a56ae030156.tar.bz2
Mark ExecuteScriptApiTest.NavigationRace disabled on OSX as well (timing out)
BUG=78802 TBR=dmaclach@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83398 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/execute_script_apitest.cc')
-rw-r--r--chrome/browser/extensions/execute_script_apitest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/extensions/execute_script_apitest.cc b/chrome/browser/extensions/execute_script_apitest.cc
index 568c85f..307d49c 100644
--- a/chrome/browser/extensions/execute_script_apitest.cc
+++ b/chrome/browser/extensions/execute_script_apitest.cc
@@ -47,7 +47,7 @@ IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest,
ASSERT_TRUE(RunExtensionTest(extension_name)) << message_;
}
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_MACOSX)
// Flakily times out: http://crbug.com/78802
#define MAYBE_NavigationRace DISABLED_NavigationRace
#else