Chromium Code Reviews| 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 67596228a415230d3ca449addefa89c64e5ea7e3..56de19a956934967983cf05c284dbedda6b8ef6e 100644 |
| --- a/chrome/test/data/nacl/nacl_test_data.gyp |
| +++ b/chrome/test/data/nacl/nacl_test_data.gyp |
| @@ -368,6 +368,68 @@ |
| ], |
| }, |
| { |
| + 'target_name': 'irt_exception_test', |
| + 'type': 'none', |
| + 'variables': { |
| + 'nexe_target': 'irt_exception_test', |
| + 'build_newlib': 1, |
| + 'generate_nmf': 1, |
| + 'nexe_destination_dir': 'nacl_test_data', |
| + 'link_flags': [ |
| + '-lppapi', |
| + '-lppapi_test_lib', |
| + '-lplatform', |
| + '-lgio', |
| + '-lnacl_exception', |
| + ], |
| + 'sources': [ |
| + 'irt_exception/irt_exception_test.cc', |
| + ], |
| + 'test_files': [ |
| + # TODO(ncbray) move into chrome/test/data/nacl when all tests are |
| + # converted. |
| + '<(DEPTH)/ppapi/native_client/tools/browser_tester/browserdata/nacltest.js', |
| + 'irt_exception/irt_exception_test.html', |
| + ], |
| + }, |
| + 'dependencies': [ |
| + '<(DEPTH)/native_client/tools.gyp:prep_toolchain', |
| + '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', |
| + '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', |
| + '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_exception_lib', |
| + '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', |
| + '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib', |
| + 'ppapi_test_lib', |
| + ], |
| + 'conditions': [ |
| + ['disable_pnacl==0 and target_arch=="ia32" and OS=="linux"', { |
|
Mark Seaborn
2014/04/25 15:42:02
Only the "enable_x86_32_nonsfi" part should be con
Junichi Uekawa
2014/04/25 22:13:53
The things here are only necessary for nonsfi, bec
|
| + 'variables': { |
|
Mark Seaborn
2014/04/25 15:42:02
This block should be indented by 2 more spaces rel
Junichi Uekawa
2014/04/25 22:13:53
Done.
|
| + 'build_pnacl_newlib': 1, |
| + 'enable_x86_32_nonsfi': 1, |
| + 'destination_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/nonsfi', |
|
Mark Seaborn
2014/04/25 15:42:02
Can you omit this destination_dir setting for cons
Junichi Uekawa
2014/04/25 22:13:53
I can call it something else, but we need this for
|
| + 'out_pnacl_newlib_x86_32_nonsfi_nexe': '>(destination_dir)/irt_exception_test_pnacl_newlib_x32_nonsfi.nexe', |
| + # Files specifically for NonSFI NaCl. nmf file is hand-crafted |
| + # until generate_nmf learns about NonSFI case. |
| + 'nonsfi_test_files': [ |
|
Mark Seaborn
2014/04/25 15:42:02
Does it work to just set "test_files", for consist
Junichi Uekawa
2014/04/25 22:13:53
test_files is already set and used and confuses th
|
| + # TODO(ncbray) move into chrome/test/data/nacl when all tests are |
| + # converted. |
| + '<(DEPTH)/ppapi/native_client/tools/browser_tester/browserdata/nacltest.js', |
| + 'irt_exception/irt_exception_test.html', |
| + 'irt_exception/irt_exception_test.nmf', |
| + ], |
| + }, |
| + 'copies': [ |
|
Mark Seaborn
2014/04/25 15:42:02
ppapi_nacl.gyp doesn't have a "copies" step so I t
Junichi Uekawa
2014/04/25 22:13:53
ppapi_nacl.gyp dumps files under out/Debug
here w
|
| + { |
| + 'destination': '>(destination_dir)', |
| + 'files': [ |
| + '>@(nonsfi_test_files)', |
| + ], |
| + }, |
| + ], |
| + }], |
| + ], |
| + }, |
| + { |
| 'target_name': 'ppapi_crash_in_callback', |
| 'type': 'none', |
| 'variables': { |