summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-27 16:32:24 +0000
committerbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-27 16:32:24 +0000
commit56432b010b5e2ed63df0c29947091d08c86db355 (patch)
treefe8edfe0e858a819aa8d44ae69581800fc8fb2d2 /chrome/test
parent50304838c80a28503908b5ad8c32ca64919a81d9 (diff)
downloadchromium_src-56432b010b5e2ed63df0c29947091d08c86db355.zip
chromium_src-56432b010b5e2ed63df0c29947091d08c86db355.tar.gz
chromium_src-56432b010b5e2ed63df0c29947091d08c86db355.tar.bz2
--test-gl-lib for GpuPixelBrowserTests
This CL causes the GpuPixelBrowserTests to load libllvmpipe.so (if it is available) and fallback to standard libGL.so otherwise. This is so that we can (ultimately) do a smoke test of the GPU accelerated display path on the Aura dbg bot on the Chromium waterfall. BUG=none TEST=none Review URL: http://codereview.chromium.org/9169100 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119457 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/gpu/gpu_pixel_browsertest.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/test/gpu/gpu_pixel_browsertest.cc b/chrome/test/gpu/gpu_pixel_browsertest.cc
index b4b98c3..649eddd 100644
--- a/chrome/test/gpu/gpu_pixel_browsertest.cc
+++ b/chrome/test/gpu/gpu_pixel_browsertest.cc
@@ -26,6 +26,7 @@
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/compositor/compositor_setup.h"
+#include "ui/gfx/gl/gl_switches.h"
#include "ui/gfx/size.h"
namespace {
@@ -71,6 +72,8 @@ class GpuPixelBrowserTest : public InProcessBrowserTest {
virtual void SetUpCommandLine(CommandLine* command_line) {
InProcessBrowserTest::SetUpCommandLine(command_line);
+ command_line->AppendSwitchASCII(switches::kTestGLLib,
+ "libllvmpipe.so");
// This enables DOM automation for tab contents.
EnableDOMAutomation();