Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Unified Diff: chrome/test/ui/pepper_uitest.cc

Issue 3067007: Enabled pepper3d test. Explicitly specified Mesa renderer to use for the 3d t... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/ui/pepper_uitest.cc
===================================================================
--- chrome/test/ui/pepper_uitest.cc (revision 53805)
+++ chrome/test/ui/pepper_uitest.cc (working copy)
@@ -3,6 +3,8 @@
// found in the LICENSE file.
#include "base/file_path.h"
+
+#include "app/app_switches.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/test/ui/npapi_test_helper.h"
#include "chrome/test/ui_test_utils.h"
@@ -28,6 +30,9 @@
launch_arguments_.AppendSwitch(switches::kNoSandbox);
launch_arguments_.AppendSwitch(switches::kInternalPepper);
launch_arguments_.AppendSwitch(switches::kEnableGPUPlugin);
+ // Use Mesa software renderer so it can run on testbots without any
+ // graphics hardware.
+ launch_arguments_.AppendSwitchWithValue(switches::kUseGL, "osmesa");
NPAPITesterBase::SetUp();
}
};
@@ -36,8 +41,7 @@
// TODO(alokp): Enable the test after making sure it works on all platforms
// and buildbots have OpenGL support.
#if defined(OS_WIN)
-// Disabled after failing on buildbots: crbug/46662
-TEST_F(PepperTester, DISABLED_Pepper3D) {
+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);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698