diff options
| -rw-r--r-- | chrome/test/ui/ppapi_uitest.cc | 19 | ||||
| -rw-r--r-- | ppapi/ppapi_sources.gypi | 10 | ||||
| -rw-r--r-- | ppapi/ppapi_untrusted.gyp | 14 |
3 files changed, 38 insertions, 5 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 diff --git a/ppapi/ppapi_sources.gypi b/ppapi/ppapi_sources.gypi index c419c80..8cdbcba 100644 --- a/ppapi/ppapi_sources.gypi +++ b/ppapi/ppapi_sources.gypi @@ -313,6 +313,9 @@ # 'test_common_source_files': [ # Common test files + 'lib/gl/gles2/gles2.c', + 'lib/gl/gles2/gl2ext_ppapi.c', + 'lib/gl/gles2/gl2ext_ppapi.h', 'tests/all_c_includes.h', 'tests/all_cpp_includes.h', 'tests/arch_dependent_sizes_32.h', @@ -338,6 +341,8 @@ 'tests/test_file_system.h', 'tests/test_graphics_2d.cc', 'tests/test_graphics_2d.h', + 'tests/test_graphics_3d.cc', + 'tests/test_graphics_3d.h', 'tests/test_host_resolver_private.cc', 'tests/test_host_resolver_private.h', 'tests/test_image_data.cc', @@ -397,9 +402,6 @@ # 'test_trusted_source_files': [ # Test cases (PLEASE KEEP THIS SECTION IN ALPHABETICAL ORDER) - 'lib/gl/gles2/gles2.c', - 'lib/gl/gles2/gl2ext_ppapi.c', - 'lib/gl/gles2/gl2ext_ppapi.h', 'tests/test_broker.cc', 'tests/test_broker.h', 'tests/test_browser_font.cc', @@ -426,8 +428,6 @@ 'tests/test_flash_message_loop.h', 'tests/test_fullscreen.cc', 'tests/test_fullscreen.h', - 'tests/test_graphics_3d.cc', - 'tests/test_graphics_3d.h', 'tests/test_net_address_private.cc', 'tests/test_net_address_private.h', 'tests/test_network_monitor_private.cc', diff --git a/ppapi/ppapi_untrusted.gyp b/ppapi/ppapi_untrusted.gyp index 6dd88ac..8dd46ab 100644 --- a/ppapi/ppapi_untrusted.gyp +++ b/ppapi/ppapi_untrusted.gyp @@ -38,6 +38,10 @@ 'native_client/native_client.gyp:nacl_irt', ], 'variables': { + 'defines': [ + '<@(default_defines)', + '-DGL_GLEXT_PROTOTYPES', + ], 'nexe_target': 'ppapi_nacl_tests', 'build_newlib': 1, 'include_dirs': [ @@ -47,6 +51,9 @@ 'link_flags': [ '-lppapi_cpp', '-lppapi', + '-lplatform', + '-lpthread', + '-lgio', ], # TODO(bradchen): get rid of extra_deps64 and extra_deps32 # once native_client/build/untrusted.gypi no longer needs them. @@ -80,6 +87,13 @@ ], }, 'conditions': [ + ['target_arch!="arm"', { + 'variables': { + 'compile_flags': [ + '-mno-tls-use-call', + ], + }, + }], ['target_arch!="arm" and disable_glibc==0', { 'variables': { 'build_glibc': 1, |