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

Side by Side 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 unified diff | Download patch
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 12 matching lines...) Expand all
23 # Files that aren't assosiated with any particular executable. 23 # Files that aren't assosiated with any particular executable.
24 'bad/ppapi_bad.html', 24 'bad/ppapi_bad.html',
25 'bad/ppapi_bad.js', 25 'bad/ppapi_bad.js',
26 'bad/ppapi_bad_native.html', 26 'bad/ppapi_bad_native.html',
27 'bad/ppapi_bad_doesnotexist.nmf', 27 'bad/ppapi_bad_doesnotexist.nmf',
28 'bad/ppapi_bad_magic.nmf', 28 'bad/ppapi_bad_magic.nmf',
29 'bad/ppapi_bad_manifest_uses_nexes.nmf', 29 'bad/ppapi_bad_manifest_uses_nexes.nmf',
30 'bad/ppapi_bad_manifest_bad_files.nmf', 30 'bad/ppapi_bad_manifest_bad_files.nmf',
31 'bad/ppapi_bad_manifest_nexe_arch.nmf', 31 'bad/ppapi_bad_manifest_nexe_arch.nmf',
32 'crash/ppapi_crash.html', 32 'crash/ppapi_crash.html',
33 'manifest_file/test_file.txt',
33 ], 34 ],
34 }, 35 },
35 }, 36 },
36 { 37 {
37 'target_name': 'simple_test', 38 'target_name': 'simple_test',
38 'type': 'none', 39 'type': 'none',
39 'variables': { 40 'variables': {
40 'nexe_target': 'simple', 41 'nexe_target': 'simple',
41 'build_newlib': 1, 42 'build_newlib': 1,
42 'build_glibc': 1, 43 'build_glibc': 1,
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 }, 473 },
473 'dependencies': [ 474 'dependencies': [
474 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 475 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
475 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', 476 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
476 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', 477 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
477 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', 478 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
478 '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib', 479 '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
479 ], 480 ],
480 }, 481 },
481 { 482 {
483 'target_name': 'pm_manifest_file',
484 'type': 'none',
485 'variables': {
486 'nexe_target': 'pm_manifest_file',
487 'build_newlib': 1,
488 'build_glibc': 1,
489 # TODO(ncbray) support file injection into PNaCl manifest.
490 'build_pnacl_newlib': 0,
491 'nexe_destination_dir': 'nacl_test_data',
492 'link_flags': [
493 '-lnacl_ppapi_util',
494 '-lppapi_cpp',
495 '-lppapi',
496 '-lsrpc',
497 '-lplatform',
498 '-lgio',
499 '-limc',
500 '-limc_syscalls',
501 '-lweak_ref',
502 ],
503 'sources': [
504 'manifest_file/pm_manifest_file_test.cc',
505 ],
506 'create_nmf_args_portable': [
507 '-xtest_file:test_file.txt',
508 '-xnmf says hello world:test_file.txt',
509 ],
510 'test_files': [
511 'manifest_file/pm_manifest_file_test.html',
512 ],
513 },
514 'dependencies': [
515 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
516 '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
517 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
518 '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:srpc_lib',
519 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
520 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
521 '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc_lib',
522 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
523 '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref_lib',
524 'nacl_ppapi_util',
525 ],
526 },
527 {
528 'target_name': 'pm_pre_init_manifest_file',
529 'type': 'none',
530 'variables': {
531 'nexe_target': 'pm_pre_init_manifest_file',
532 'build_newlib': 1,
533 'build_glibc': 1,
534 # TODO(ncbray) support file injection into PNaCl manifest.
535 'build_pnacl_newlib': 0,
536 'nexe_destination_dir': 'nacl_test_data',
537 'link_flags': [
538 '-lnacl_ppapi_util',
539 '-lppapi_cpp',
540 '-lppapi',
541 '-lsrpc',
542 '-lplatform',
543 '-lgio',
544 '-limc',
545 '-limc_syscalls',
546 '-lweak_ref',
547 ],
548 'sources': [
549 'manifest_file/pm_pre_init_manifest_file_test.cc',
550 ],
551 'create_nmf_args_portable': [
552 '-xtest_file:test_file.txt',
553 '-xnmf says hello world:test_file.txt',
554 ],
555 'test_files': [
556 'manifest_file/pm_pre_init_manifest_file_test.html',
557 ],
558 },
559 'dependencies': [
560 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
561 '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
562 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
563 '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:srpc_lib',
564 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
565 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
566 '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc_lib',
567 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
568 '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref_lib',
569 'nacl_ppapi_util',
570 ],
571 },
572 {
573 'target_name': 'irt_manifest_file',
574 'type': 'none',
575 'variables': {
576 'nexe_target': 'irt_manifest_file',
577 'build_newlib': 1,
578 # Linking problems - can't find __nacl_irt_query.
579 'build_glibc': 0,
580 # TODO(ncbray) support file injection into PNaCl manifest.
581 'build_pnacl_newlib': 0,
582 'nexe_destination_dir': 'nacl_test_data',
583 'link_flags': [
584 '-lnacl_ppapi_util',
585 '-lppapi_cpp',
586 '-lppapi',
587 '-lsrpc',
588 '-lplatform',
589 '-lgio',
590 '-limc',
591 '-limc_syscalls',
592 '-lweak_ref',
593 '-lnacl',
594 ],
595 'sources': [
596 'manifest_file/irt_manifest_file_test.cc',
597 ],
598 'create_nmf_args_portable': [
599 '-xtest_file:test_file.txt',
600 '-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
601 ],
602 'test_files': [
603 'manifest_file/irt_manifest_file_test.html',
604 ],
605 },
606 'dependencies': [
607 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
608 '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
609 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
610 '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:srpc_lib',
611 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
612 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
613 '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc_lib',
614 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
615 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib',
616 '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref_lib',
617 'nacl_ppapi_util',
618 ],
619 },
620 {
482 'target_name': 'pm_nameservice_test', 621 'target_name': 'pm_nameservice_test',
483 'type': 'none', 622 'type': 'none',
484 'variables': { 623 'variables': {
485 'nexe_target': 'pm_nameservice_test', 624 'nexe_target': 'pm_nameservice_test',
486 'build_newlib': 1, 625 'build_newlib': 1,
487 'build_glibc': 1, 626 'build_glibc': 1,
488 'build_pnacl_newlib': 1, 627 'build_pnacl_newlib': 1,
489 'nexe_destination_dir': 'nacl_test_data', 628 'nexe_destination_dir': 'nacl_test_data',
490 'link_flags': [ 629 'link_flags': [
491 '-lnacl_ppapi_util', 630 '-lnacl_ppapi_util',
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
780 ], 919 ],
781 }, 920 },
782 'dependencies': [ 921 'dependencies': [
783 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 922 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
784 ], 923 ],
785 }, 924 },
786 ], 925 ],
787 }], 926 }],
788 ], 927 ],
789 } 928 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698