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 /ppapi | |
| 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 'ppapi')
| -rw-r--r-- | ppapi/ppapi_sources.gypi | 10 | ||||
| -rw-r--r-- | ppapi/ppapi_untrusted.gyp | 14 |
2 files changed, 19 insertions, 5 deletions
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, |