diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-12 00:11:09 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-12 00:11:09 +0000 |
| commit | 82017272e7272182443d7054911c4f890346353e (patch) | |
| tree | fcfeec60510cf806588e87350b9769c7bb5834e2 | |
| parent | 8b1a931b39efcd75b1a8e212e23b4c52e33308af (diff) | |
| download | chromium_src-82017272e7272182443d7054911c4f890346353e.zip chromium_src-82017272e7272182443d7054911c4f890346353e.tar.gz chromium_src-82017272e7272182443d7054911c4f890346353e.tar.bz2 | |
Disabled toolstrip tests
BUG=30151
TEST=Run browser_tests and ui_tests on linux_views. toolstrip tests should be disabled.
Review URL: http://codereview.chromium.org/491058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34396 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/extension_browsertests_misc.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_toolstrip_apitest.cc | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc index f17b72a..4e16d2a 100644 --- a/chrome/browser/extensions/extension_browsertests_misc.cc +++ b/chrome/browser/extensions/extension_browsertests_misc.cc @@ -63,6 +63,11 @@ static ExtensionHost* FindHostWithPath(ExtensionProcessManager* manager, return host; } +#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) +// See http://crbug.com/30151. +#define Toolstrip DISABLED_Toolstrip +#endif + // Tests that toolstrips initializes properly and can run basic extension js. IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, Toolstrip) { FilePath extension_test_data_dir = test_data_dir_.AppendASCII("good"). diff --git a/chrome/browser/extensions/extension_toolstrip_apitest.cc b/chrome/browser/extensions/extension_toolstrip_apitest.cc index 6e08bd4..93153da 100644 --- a/chrome/browser/extensions/extension_toolstrip_apitest.cc +++ b/chrome/browser/extensions/extension_toolstrip_apitest.cc @@ -4,8 +4,11 @@ #include "chrome/browser/extensions/extension_apitest.h" -#if !defined(OS_CHROMEOS) +#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) +// See http://crbug.com/30151. +#define Toolstrip DISABLED_Toolstrip +#endif + IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Toolstrip) { ASSERT_TRUE(RunExtensionTest("toolstrip")) << message_; } -#endif |