Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2528)

Unified Diff: chrome/test/data/nacl/nacl_test_data.gyp

Issue 126803003: Port nameservice test from nacl_integration to browser_tests. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: DEPS Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « DEPS ('k') | chrome/test/data/nacl/nameservice/pm_nameservice_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/nacl/nacl_test_data.gyp
diff --git a/chrome/test/data/nacl/nacl_test_data.gyp b/chrome/test/data/nacl/nacl_test_data.gyp
index ed8a6e3f0952b458fc7cdb73b0dbb044138f36e3..c7e19265e0b7579667d24d3ea185e97104cda2aa 100644
--- a/chrome/test/data/nacl/nacl_test_data.gyp
+++ b/chrome/test/data/nacl/nacl_test_data.gyp
@@ -108,6 +108,27 @@
],
},
{
+ 'target_name': 'nacl_ppapi_util',
+ 'type': 'none',
+ 'variables': {
+ 'nlib_target': 'libnacl_ppapi_util.a',
+ 'nso_target': 'libnacl_ppapi_util.so',
+ 'build_newlib': 1,
+ 'build_glibc': 1,
+ 'build_pnacl_newlib': 1,
+ 'nexe_destination_dir': 'nacl_test_data',
+ 'sources': [
+ # TODO(ncbray) move these files once SCons no longer depends on them.
+ '../../../../ppapi/native_client/src/untrusted/nacl_ppapi_util/string_buffer.cc',
+ '../../../../ppapi/native_client/src/untrusted/nacl_ppapi_util/nacl_ppapi_util.cc',
+ '../../../../ppapi/native_client/src/untrusted/nacl_ppapi_util/ppapi_srpc_main.c',
+ ]
+ },
+ 'dependencies': [
+ '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+ ],
+ },
+ {
'target_name': 'ppapi_progress_events',
'type': 'none',
'variables': {
@@ -458,6 +479,46 @@
],
},
{
+ 'target_name': 'pm_nameservice_test',
+ 'type': 'none',
+ 'variables': {
+ 'nexe_target': 'pm_nameservice_test',
+ 'build_newlib': 1,
+ 'build_glibc': 1,
+ 'build_pnacl_newlib': 1,
+ 'nexe_destination_dir': 'nacl_test_data',
+ 'link_flags': [
+ '-lnacl_ppapi_util',
+ '-lppapi_cpp',
+ '-lppapi',
+ '-lsrpc',
+ '-lplatform',
+ '-lgio',
+ '-limc',
+ '-limc_syscalls',
+ '-lweak_ref',
+ ],
+ 'sources': [
+ 'nameservice/pm_nameservice_test.cc',
+ ],
+ 'test_files': [
+ 'nameservice/pm_nameservice_test.html',
+ ],
+ },
+ 'dependencies': [
+ '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+ '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+ '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
+ '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:srpc_lib',
+ '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
+ '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
+ '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc_lib',
+ '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
+ '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref_lib',
+ 'nacl_ppapi_util',
+ ],
+ },
+ {
'target_name': 'pnacl_error_handling_test',
'type': 'none',
'variables': {
« no previous file with comments | « DEPS ('k') | chrome/test/data/nacl/nameservice/pm_nameservice_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698