diff options
author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 20:36:12 +0000 |
---|---|---|
committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 20:36:12 +0000 |
commit | b846407ff810e7cfb21642803bd00ed4d4883dc3 (patch) | |
tree | c23895b9072285c30b1d8bc89aae7acbb0ec7612 /chrome/test/plugin | |
parent | 7657ace4de62d17819009017847974a01bfc85f4 (diff) | |
download | chromium_src-b846407ff810e7cfb21642803bd00ed4d4883dc3.zip chromium_src-b846407ff810e7cfb21642803bd00ed4d4883dc3.tar.gz chromium_src-b846407ff810e7cfb21642803bd00ed4d4883dc3.tar.bz2 |
Make PluginTest.Real amd PluginTest.MediaPlayerNew only run on Debug Perf Bot. When we enabled them on the Release Perf Bots, they didn't work as expected.
BUG=44662
BUG=44673
TEST=none
TBR=robertshield
Review URL: http://codereview.chromium.org/2091016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/plugin')
-rw-r--r-- | chrome/test/plugin/plugin_test.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp index 4d70f56..e6d6a53 100644 --- a/chrome/test/plugin/plugin_test.cpp +++ b/chrome/test/plugin/plugin_test.cpp @@ -143,7 +143,11 @@ TEST_F(PluginTest, Quicktime) { TestPlugin("quicktime.html", action_max_timeout_ms(), false); } -TEST_F(PluginTest, DISABLED_MediaPlayerNew) { +// Disabled on Release bots - http://crbug.com/44662 +#if !defined(NDEBUG) +#define MediaPlayerNew DISABLED_MediaPlayerNew +#endif +TEST_F(PluginTest, MediaPlayerNew) { TestPlugin("wmp_new.html", action_max_timeout_ms(), false); } @@ -152,6 +156,10 @@ TEST_F(PluginTest, DISABLED_MediaPlayerOld) { TestPlugin("wmp_old.html", action_max_timeout_ms(), false); } +#if !defined(NDEBUG) +#define Real DISABLED_Real +#endif +// Disabled on Release bots - http://crbug.com/44673 TEST_F(PluginTest, Real) { TestPlugin("real.html", action_max_timeout_ms(), false); } |