diff options
| author | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 19:27:26 +0000 |
|---|---|---|
| committer | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 19:27:26 +0000 |
| commit | 46c9a05f578dce497f03f265105872dfaa31a656 (patch) | |
| tree | 4d43d8d5d4ac8f0f53a053e1283efa04c9c16026 /chrome/test/ui | |
| parent | a1d55349dce727b11160bdb60608130031f204ce (diff) | |
| download | chromium_src-46c9a05f578dce497f03f265105872dfaa31a656.zip chromium_src-46c9a05f578dce497f03f265105872dfaa31a656.tar.gz chromium_src-46c9a05f578dce497f03f265105872dfaa31a656.tar.bz2 | |
Add test_graphics3d to ppapi_uitest, untrusted (NaCl) test suite, using
OSMesa as needed for bots. Add AudioConfig tests to ppapi_uitest
untrusted (NaCl) suite. Tweak gyp for untrusted NaCl build so apps using
TLS links without errors.
Addendum: don't add -mno-tls-use-call to arm build (otherwise pnacl compiler
will fail because it doesn't recognize this option.)
BUG=none
TEST=this is the test
Review URL: https://chromiumcodereview.appspot.com/10682005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144512 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui')
| -rw-r--r-- | chrome/test/ui/ppapi_uitest.cc | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc index bfc38d3..031fdf9 100644 --- a/chrome/test/ui/ppapi_uitest.cc +++ b/chrome/test/ui/ppapi_uitest.cc @@ -18,6 +18,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" +#include "chrome/test/base/test_launcher_utils.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/dom_operation_notification_details.h" #include "content/public/browser/notification_types.h" @@ -25,9 +26,11 @@ #include "content/public/common/content_paths.h" #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" +#include "content/test/gpu/test_switches.h" #include "media/audio/audio_manager.h" #include "net/base/net_util.h" #include "net/test/test_server.h" +#include "ui/gl/gl_switches.h" #include "webkit/plugins/plugin_switches.h" using content::DomOperationNotificationDetails; @@ -125,6 +128,15 @@ PPAPITestBase::PPAPITestBase() { } void PPAPITestBase::SetUpCommandLine(CommandLine* command_line) { + // Do not use mesa if real GPU is required. + if (!command_line->HasSwitch(switches::kUseGpuInTests)) { +#if !defined(OS_MACOSX) + CHECK(test_launcher_utils::OverrideGLImplementation( + command_line, gfx::kGLImplementationOSMesaName)) << + "kUseGL must not be set by test framework code!"; +#endif + } + // The test sends us the result via a cookie. command_line->AppendSwitch(switches::kEnableFileCookies); @@ -544,6 +556,10 @@ TEST_PPAPI_IN_PROCESS(Graphics2D) TEST_PPAPI_OUT_OF_PROCESS(Graphics2D) TEST_PPAPI_NACL_VIA_HTTP(Graphics2D) +TEST_PPAPI_IN_PROCESS(Graphics3D) +TEST_PPAPI_OUT_OF_PROCESS(Graphics3D) +TEST_PPAPI_NACL_VIA_HTTP(Graphics3D) + TEST_PPAPI_IN_PROCESS(ImageData) TEST_PPAPI_OUT_OF_PROCESS(ImageData) @@ -1019,6 +1035,9 @@ TEST_PPAPI_IN_PROCESS(AudioConfig_InvalidConfigs) TEST_PPAPI_OUT_OF_PROCESS(AudioConfig_RecommendSampleRate) TEST_PPAPI_OUT_OF_PROCESS(AudioConfig_ValidConfigs) TEST_PPAPI_OUT_OF_PROCESS(AudioConfig_InvalidConfigs) +TEST_PPAPI_NACL_VIA_HTTP(AudioConfig_RecommendSampleRate) +TEST_PPAPI_NACL_VIA_HTTP(AudioConfig_ValidConfigs) +TEST_PPAPI_NACL_VIA_HTTP(AudioConfig_InvalidConfigs) // Only run audio output tests if we have an audio device available. // TODO(raymes): We should probably test scenarios where there is no audio |