diff options
author | kerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-09 00:39:19 +0000 |
---|---|---|
committer | kerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-09 00:39:19 +0000 |
commit | 924a36a58f277e2c91e67298ea6c8c9943771f66 (patch) | |
tree | eb8af56e40d09dc95d5c2b234c4dd62a04212b84 | |
parent | c68020a00a0ce81ebe6ce066681025793760ace3 (diff) | |
download | chromium_src-924a36a58f277e2c91e67298ea6c8c9943771f66.zip chromium_src-924a36a58f277e2c91e67298ea6c8c9943771f66.tar.gz chromium_src-924a36a58f277e2c91e67298ea6c8c9943771f66.tar.bz2 |
Disable cros tests that do not pass on the branch.
BUG=92105
Review URL: http://codereview.chromium.org/7599012
git-svn-id: svn://svn.chromium.org/chrome/branches/835/src@95922 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/extensions/execute_script_apitest.cc | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/chrome/browser/extensions/execute_script_apitest.cc b/chrome/browser/extensions/execute_script_apitest.cc index abf60be..ee8db03 100644 --- a/chrome/browser/extensions/execute_script_apitest.cc +++ b/chrome/browser/extensions/execute_script_apitest.cc @@ -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(); ASSERT_TRUE(StartTestServer()); 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(); ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(RunExtensionTest("executescript/in_frame")) << message_; @@ -80,7 +94,15 @@ IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, "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(); ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(RunExtensionTest("executescript/frame_after_load")) << message_; |