diff options
| author | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-05 12:32:09 +0000 |
|---|---|---|
| committer | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-05 12:32:09 +0000 |
| commit | 69c873e449d001bdee357696be6db03cb0233c68 (patch) | |
| tree | 8c86f864e2715d336cfa45aac73ed4a064f01fc5 /chrome | |
| parent | 915c46ceda16ce67581ebc979a2d81818b5e6cce (diff) | |
| download | chromium_src-69c873e449d001bdee357696be6db03cb0233c68.zip chromium_src-69c873e449d001bdee357696be6db03cb0233c68.tar.gz chromium_src-69c873e449d001bdee357696be6db03cb0233c68.tar.bz2 | |
Disable DefaultPluginUITest::DefaultPluginLoadTest on windows as it crashes.
BUG=57952
TEST=none
TBR=thakis@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61501 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/default_plugin_uitest.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/default_plugin_uitest.cc b/chrome/browser/default_plugin_uitest.cc index c6c5221..5bd0afa 100644 --- a/chrome/browser/default_plugin_uitest.cc +++ b/chrome/browser/default_plugin_uitest.cc @@ -16,7 +16,12 @@ class DefaultPluginUITest : public UITest { } }; -TEST_F(DefaultPluginUITest, DefaultPluginLoadTest) { +#if defined(OS_WIN) +#define MAYBE_DefaultPluginLoadTest DISABLED_DefaultPluginLoadTest +#else +#define MAYBE_DefaultPluginLoadTest DefaultPluginLoadTest +#endif +TEST_F(DefaultPluginUITest, MAYBE_DefaultPluginLoadTest) { // Open page with default plugin. FilePath test_file(test_data_directory_); test_file = test_file.AppendASCII("default_plugin.html"); |