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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 133033002: Port manifest query tests from nacl_integration to browser_tests. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: 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 | « chrome/test/data/nacl/manifest_file/test_file.txt ('k') | chrome/test/nacl/nacl_browsertest.cc » ('j') | ppapi/ppapi_nacl_test_common.gypi » ('J')
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 c7e19265e0b7579667d24d3ea185e97104cda2aa..1de32f4f8f0b7c417ddf66f1016c127793e57e2b 100644
--- a/chrome/test/data/nacl/nacl_test_data.gyp
+++ b/chrome/test/data/nacl/nacl_test_data.gyp
@@ -30,6 +30,7 @@
'bad/ppapi_bad_manifest_bad_files.nmf',
'bad/ppapi_bad_manifest_nexe_arch.nmf',
'crash/ppapi_crash.html',
+ 'manifest_file/test_file.txt',
],
},
},
@@ -479,6 +480,144 @@
],
},
{
+ 'target_name': 'pm_manifest_file',
+ 'type': 'none',
+ 'variables': {
+ 'nexe_target': 'pm_manifest_file',
+ 'build_newlib': 1,
+ 'build_glibc': 1,
+ # TODO(ncbray) support file injection into PNaCl manifest.
+ 'build_pnacl_newlib': 0,
+ 'nexe_destination_dir': 'nacl_test_data',
+ 'link_flags': [
+ '-lnacl_ppapi_util',
+ '-lppapi_cpp',
+ '-lppapi',
+ '-lsrpc',
+ '-lplatform',
+ '-lgio',
+ '-limc',
+ '-limc_syscalls',
+ '-lweak_ref',
+ ],
+ 'sources': [
+ 'manifest_file/pm_manifest_file_test.cc',
+ ],
+ 'create_nmf_args_portable': [
+ '-xtest_file:test_file.txt',
+ '-xnmf says hello world:test_file.txt',
+ ],
+ 'test_files': [
+ 'manifest_file/pm_manifest_file_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': 'pm_pre_init_manifest_file',
+ 'type': 'none',
+ 'variables': {
+ 'nexe_target': 'pm_pre_init_manifest_file',
+ 'build_newlib': 1,
+ 'build_glibc': 1,
+ # TODO(ncbray) support file injection into PNaCl manifest.
+ 'build_pnacl_newlib': 0,
+ 'nexe_destination_dir': 'nacl_test_data',
+ 'link_flags': [
+ '-lnacl_ppapi_util',
+ '-lppapi_cpp',
+ '-lppapi',
+ '-lsrpc',
+ '-lplatform',
+ '-lgio',
+ '-limc',
+ '-limc_syscalls',
+ '-lweak_ref',
+ ],
+ 'sources': [
+ 'manifest_file/pm_pre_init_manifest_file_test.cc',
+ ],
+ 'create_nmf_args_portable': [
+ '-xtest_file:test_file.txt',
+ '-xnmf says hello world:test_file.txt',
+ ],
+ 'test_files': [
+ 'manifest_file/pm_pre_init_manifest_file_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': 'irt_manifest_file',
+ 'type': 'none',
+ 'variables': {
+ 'nexe_target': 'irt_manifest_file',
+ 'build_newlib': 1,
+ # Linking problems - can't find __nacl_irt_query.
+ 'build_glibc': 0,
+ # TODO(ncbray) support file injection into PNaCl manifest.
+ 'build_pnacl_newlib': 0,
+ 'nexe_destination_dir': 'nacl_test_data',
+ 'link_flags': [
+ '-lnacl_ppapi_util',
+ '-lppapi_cpp',
+ '-lppapi',
+ '-lsrpc',
+ '-lplatform',
+ '-lgio',
+ '-limc',
+ '-limc_syscalls',
+ '-lweak_ref',
+ '-lnacl',
+ ],
+ 'sources': [
+ 'manifest_file/irt_manifest_file_test.cc',
+ ],
+ 'create_nmf_args_portable': [
+ '-xtest_file:test_file.txt',
+ '-xnmf says hello world:test_file.txt',
bradn 2014/01/10 17:48:36 what's up with this says hello word stuff?
bradnelson 2014/01/10 17:54:54 For the record, this was duplicating the original
+ ],
+ 'test_files': [
+ 'manifest_file/irt_manifest_file_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/untrusted/nacl/nacl.gyp:nacl_lib',
+ '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref_lib',
+ 'nacl_ppapi_util',
+ ],
+ },
+ {
'target_name': 'pm_nameservice_test',
'type': 'none',
'variables': {
« no previous file with comments | « chrome/test/data/nacl/manifest_file/test_file.txt ('k') | chrome/test/nacl/nacl_browsertest.cc » ('j') | ppapi/ppapi_nacl_test_common.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698