diff options
| author | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-25 22:06:35 +0000 |
|---|---|---|
| committer | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-25 22:06:35 +0000 |
| commit | 696c93c1136d4de9d3d50124a8e728fbad7d9537 (patch) | |
| tree | f4d495903459416a8f4c4607adbed8d916d83fc9 /ppapi | |
| parent | 70ced7cc0a959b9ca1b7ee0d6037ab80de264be4 (diff) | |
| download | chromium_src-696c93c1136d4de9d3d50124a8e728fbad7d9537.zip chromium_src-696c93c1136d4de9d3d50124a8e728fbad7d9537.tar.gz chromium_src-696c93c1136d4de9d3d50124a8e728fbad7d9537.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.
BUG=none
TEST=this is the test
Review URL: https://chromiumcodereview.appspot.com/10591004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/ppapi_sources.gypi | 10 | ||||
| -rw-r--r-- | ppapi/ppapi_untrusted.gyp | 10 |
2 files changed, 15 insertions, 5 deletions
diff --git a/ppapi/ppapi_sources.gypi b/ppapi/ppapi_sources.gypi index b54c8e3..25af3e6 100644 --- a/ppapi/ppapi_sources.gypi +++ b/ppapi/ppapi_sources.gypi @@ -311,6 +311,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', @@ -336,6 +339,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', @@ -395,9 +400,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', @@ -424,8 +426,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..8c4b2fa 100644 --- a/ppapi/ppapi_untrusted.gyp +++ b/ppapi/ppapi_untrusted.gyp @@ -38,6 +38,13 @@ 'native_client/native_client.gyp:nacl_irt', ], 'variables': { + 'defines': [ + '<@(default_defines)', + '-DGL_GLEXT_PROTOTYPES', + ], + 'compile_flags': [ + '-mno-tls-use-call', + ], 'nexe_target': 'ppapi_nacl_tests', 'build_newlib': 1, 'include_dirs': [ @@ -47,6 +54,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. |