diff options
| author | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-01 19:10:12 +0000 |
|---|---|---|
| committer | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-01 19:10:12 +0000 |
| commit | 9371970ee8ebd1ed597c1b4cb60da676bc36563c (patch) | |
| tree | 3f422e487599f1365670c67d11140003b4425fd4 /chrome/test/ui | |
| parent | b7c6924e54a0e9b1244bb86b0d71e1f677fb9f0e (diff) | |
| download | chromium_src-9371970ee8ebd1ed597c1b4cb60da676bc36563c.zip chromium_src-9371970ee8ebd1ed597c1b4cb60da676bc36563c.tar.gz chromium_src-9371970ee8ebd1ed597c1b4cb60da676bc36563c.tar.bz2 | |
Enabled pepper-3d test on mac. It will be enabled on other platforms as soon as they support OpenGL 2.0.
Review URL: http://codereview.chromium.org/1565005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43367 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui')
| -rw-r--r-- | chrome/test/ui/pepper_uitest.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/test/ui/pepper_uitest.cc b/chrome/test/ui/pepper_uitest.cc index 01b14e3..9093fc9 100644 --- a/chrome/test/ui/pepper_uitest.cc +++ b/chrome/test/ui/pepper_uitest.cc @@ -37,7 +37,8 @@ class PepperTester : public NPAPITesterBase { // Test that a pepper 3d plugin loads and renders. // TODO(alokp): Enable the test after making sure it works on all platforms // and buildbots have OpenGL support. -TEST_F(PepperTester, DISABLED_Pepper3D) { +#if defined(OS_MACOSX) +TEST_F(PepperTester, Pepper3D) { const FilePath dir(FILE_PATH_LITERAL("pepper")); const FilePath file(FILE_PATH_LITERAL("pepper_3d.html")); GURL url = ui_test_utils::GetTestUrl(dir, file); @@ -46,3 +47,4 @@ TEST_F(PepperTester, DISABLED_Pepper3D) { kTestCompleteCookie, kTestCompleteSuccess, kShortWaitTimeout); } +#endif // OS_MACOSX |