Commit 630817f1 authored by kerz@chromium.org's avatar kerz@chromium.org

Disable cros tests on trunk.

BUG=92105
Review URL: http://codereview.chromium.org/7608003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96066 0039d316-1c4b-4281-b951-d872f2087c98
parent f2c2b3c3
...@@ -15,13 +15,27 @@ class ExecuteScriptApiTest : public ExtensionApiTest { ...@@ -15,13 +15,27 @@ class ExecuteScriptApiTest : public ExtensionApiTest {
} }
}; };
IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptBasic) { // DISABLED http://crbug.com/92105
#if defined(OS_CHROMEOS)
#define MAYBE_ExecuteScriptBasic DISABLED_ExecuteScriptBasic
#else
#define MAYBE_ExecuteScriptBasic ExecuteScriptBasic
#endif // defined(OS_CHROMEOS)
IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, MAYBE_ExecuteScriptBasic) {
SetupDelayedHostResolver(); SetupDelayedHostResolver();
ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(StartTestServer());
ASSERT_TRUE(RunExtensionTest("executescript/basic")) << message_; ASSERT_TRUE(RunExtensionTest("executescript/basic")) << message_;
} }
IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptInFrame) { // DISABLED http://crbug.com/92105
#if defined(OS_CHROMEOS)
#define MAYBE_ExecuteScriptInFrame DISABLED_ExecuteScriptInFrame
#else
#define MAYBE_ExecuteScriptInFrame ExecuteScriptInFrame
#endif // defined(OS_CHROMEOS)
IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, MAYBE_ExecuteScriptInFrame) {
SetupDelayedHostResolver(); SetupDelayedHostResolver();
ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(StartTestServer());
ASSERT_TRUE(RunExtensionTest("executescript/in_frame")) << message_; ASSERT_TRUE(RunExtensionTest("executescript/in_frame")) << message_;
...@@ -80,7 +94,15 @@ IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ...@@ -80,7 +94,15 @@ IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest,
"javascript_url.html")) << message_; "javascript_url.html")) << message_;
} }
IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptFrameAfterLoad) { // DISABLED http://crbug.com/92105
#if defined(OS_CHROMEOS)
#define MAYBE_ExecuteScriptFrameAfterLoad DISABLED_ExecuteScriptFrameAfterLoad
#else
#define MAYBE_ExecuteScriptFrameAfterLoad ExecuteScriptFrameAfterLoad
#endif // defined(OS_CHROMEOS)
IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest,
MAYBE_ExecuteScriptFrameAfterLoad) {
SetupDelayedHostResolver(); SetupDelayedHostResolver();
ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(StartTestServer());
ASSERT_TRUE(RunExtensionTest("executescript/frame_after_load")) << message_; ASSERT_TRUE(RunExtensionTest("executescript/frame_after_load")) << message_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment