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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « DEPS ('k') | chrome/test/data/nacl/nameservice/pm_nameservice_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'includes': [ 6 'includes': [
7 '../../../../ppapi/ppapi_nacl_test_common.gypi', 7 '../../../../ppapi/ppapi_nacl_test_common.gypi',
8 ], 8 ],
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 '../../../../ppapi/native_client/tests/ppapi_test_lib/module_instance. cc', 101 '../../../../ppapi/native_client/tests/ppapi_test_lib/module_instance. cc',
102 '../../../../ppapi/native_client/tests/ppapi_test_lib/testable_callbac k.cc', 102 '../../../../ppapi/native_client/tests/ppapi_test_lib/testable_callbac k.cc',
103 '../../../../ppapi/native_client/tests/ppapi_test_lib/test_interface.c c', 103 '../../../../ppapi/native_client/tests/ppapi_test_lib/test_interface.c c',
104 ] 104 ]
105 }, 105 },
106 'dependencies': [ 106 'dependencies': [
107 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 107 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
108 ], 108 ],
109 }, 109 },
110 { 110 {
111 'target_name': 'nacl_ppapi_util',
112 'type': 'none',
113 'variables': {
114 'nlib_target': 'libnacl_ppapi_util.a',
115 'nso_target': 'libnacl_ppapi_util.so',
116 'build_newlib': 1,
117 'build_glibc': 1,
118 'build_pnacl_newlib': 1,
119 'nexe_destination_dir': 'nacl_test_data',
120 'sources': [
121 # TODO(ncbray) move these files once SCons no longer depends on them.
122 '../../../../ppapi/native_client/src/untrusted/nacl_ppapi_util/string_ buffer.cc',
123 '../../../../ppapi/native_client/src/untrusted/nacl_ppapi_util/nacl_pp api_util.cc',
124 '../../../../ppapi/native_client/src/untrusted/nacl_ppapi_util/ppapi_s rpc_main.c',
125 ]
126 },
127 'dependencies': [
128 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
129 ],
130 },
131 {
111 'target_name': 'ppapi_progress_events', 132 'target_name': 'ppapi_progress_events',
112 'type': 'none', 133 'type': 'none',
113 'variables': { 134 'variables': {
114 'nexe_target': 'ppapi_progress_events', 135 'nexe_target': 'ppapi_progress_events',
115 'build_newlib': 1, 136 'build_newlib': 1,
116 'build_glibc': 1, 137 'build_glibc': 1,
117 'build_pnacl_newlib': 1, 138 'build_pnacl_newlib': 1,
118 'nexe_destination_dir': 'nacl_test_data', 139 'nexe_destination_dir': 'nacl_test_data',
119 'link_flags': [ 140 'link_flags': [
120 '-lppapi', 141 '-lppapi',
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 }, 472 },
452 'dependencies': [ 473 'dependencies': [
453 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 474 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
454 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', 475 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
455 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', 476 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
456 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', 477 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
457 '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib', 478 '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
458 ], 479 ],
459 }, 480 },
460 { 481 {
482 'target_name': 'pm_nameservice_test',
483 'type': 'none',
484 'variables': {
485 'nexe_target': 'pm_nameservice_test',
486 'build_newlib': 1,
487 'build_glibc': 1,
488 'build_pnacl_newlib': 1,
489 'nexe_destination_dir': 'nacl_test_data',
490 'link_flags': [
491 '-lnacl_ppapi_util',
492 '-lppapi_cpp',
493 '-lppapi',
494 '-lsrpc',
495 '-lplatform',
496 '-lgio',
497 '-limc',
498 '-limc_syscalls',
499 '-lweak_ref',
500 ],
501 'sources': [
502 'nameservice/pm_nameservice_test.cc',
503 ],
504 'test_files': [
505 'nameservice/pm_nameservice_test.html',
506 ],
507 },
508 'dependencies': [
509 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
510 '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
511 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
512 '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:srpc_lib',
513 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
514 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
515 '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc_lib',
516 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
517 '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref_lib',
518 'nacl_ppapi_util',
519 ],
520 },
521 {
461 'target_name': 'pnacl_error_handling_test', 522 'target_name': 'pnacl_error_handling_test',
462 'type': 'none', 523 'type': 'none',
463 'variables': { 524 'variables': {
464 'build_pnacl_newlib': 1, 525 'build_pnacl_newlib': 1,
465 'nexe_destination_dir': 'nacl_test_data', 526 'nexe_destination_dir': 'nacl_test_data',
466 # No need to translate AOT. 527 # No need to translate AOT.
467 'enable_x86_32': 0, 528 'enable_x86_32': 0,
468 'enable_x86_64': 0, 529 'enable_x86_64': 0,
469 'enable_arm': 0, 530 'enable_arm': 0,
470 # Use prebuilt NMF files. 531 # Use prebuilt NMF files.
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 ], 780 ],
720 }, 781 },
721 'dependencies': [ 782 'dependencies': [
722 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 783 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
723 ], 784 ],
724 }, 785 },
725 ], 786 ],
726 }], 787 }],
727 ], 788 ],
728 } 789 }
OLDNEW
« 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