summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/execute_script_apitest.cc
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-19 15:42:29 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-19 15:42:29 +0000
commitc8d0c9e77e84c2aaa7f772b253c20c04450dc06b (patch)
tree2a799d69abb548e11e415ff0b53510bf19ed17e0 /chrome/browser/extensions/execute_script_apitest.cc
parent1265ac9db185dc910a0c4244edd4a07aa18e2c06 (diff)
downloadchromium_src-c8d0c9e77e84c2aaa7f772b253c20c04450dc06b.zip
chromium_src-c8d0c9e77e84c2aaa7f772b253c20c04450dc06b.tar.gz
chromium_src-c8d0c9e77e84c2aaa7f772b253c20c04450dc06b.tar.bz2
Marking NavigationRaceJavaScriptUrl as disabled on Linux (it causes a check on Linux Views dbg).
BUG=89731 TEST=NONE TBR=grt,mihaip Review URL: http://codereview.chromium.org/7443002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93025 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/execute_script_apitest.cc')
-rw-r--r--chrome/browser/extensions/execute_script_apitest.cc11
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome/browser/extensions/execute_script_apitest.cc b/chrome/browser/extensions/execute_script_apitest.cc
index 76926bd..abf60be 100644
--- a/chrome/browser/extensions/execute_script_apitest.cc
+++ b/chrome/browser/extensions/execute_script_apitest.cc
@@ -63,7 +63,16 @@ IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, NavigationRaceExecuteScript) {
"execute_script.html")) << message_;
}
-IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, NavigationRaceJavaScriptUrl) {
+
+#if defined(OS_LINUX)
+// Fails on Linux. http://crbug.com/89731
+#define MAYBE_NavigationRaceJavaScriptUrl DISABLED_NavigationRaceJavaScriptUrl
+#else
+#define MAYBE_NavigationRaceJavaScriptUrl NavigationRaceJavaScriptUrl
+#endif
+
+IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest,
+ MAYBE_NavigationRaceJavaScriptUrl) {
host_resolver()->AddRule("a.com", "127.0.0.1");
host_resolver()->AddRule("b.com", "127.0.0.1");
ASSERT_TRUE(StartTestServer());