| 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..9d41a432d885ed35a26b59b8f6bac55c495676f6 100644
|
| --- a/chrome/test/data/nacl/nacl_test_data.gyp
|
| +++ b/chrome/test/data/nacl/nacl_test_data.gyp
|
| @@ -368,6 +368,96 @@
|
| ],
|
| },
|
| {
|
| + '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',
|
| + ],
|
| + },
|
| + {
|
| + # TODO(uekawa): Because of nmf file, NonSFI and SFI gyp configs don't mix, or do they?
|
| + 'target_name': 'irt_exception_test_nonsfi',
|
| + 'type': 'none',
|
| + 'variables': {
|
| + 'destination_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/nonsfi',
|
| + 'nexe_target': 'irt_exception_test',
|
| + 'out_pnacl_newlib_x86_32_nonsfi_nexe': '>(destination_dir)/irt_exception_test_pnacl_newlib_x32_nonsfi.nexe',
|
| + 'enable_x86_32': 0,
|
| + 'enable_x86_64': 0,
|
| + # Build pexe with newlib and then convert to nexe.
|
| + 'enable_x86_32_nonsfi': 1,
|
| + 'build_pnacl_newlib': 1,
|
| + # Use a pre-prepared nmf file.
|
| + # create_nmf.py needs to be updated to support nonsfi target.
|
| + 'generate_nmf': 0,
|
| + 'nexe_destination_dir': 'nacl_test_data',
|
| + 'link_flags': [
|
| + '-lppapi',
|
| + '-lppapi_test_lib',
|
| + '-lplatform',
|
| + '-lgio',
|
| + '-lnacl_exception',
|
| + ],
|
| + 'sources': [
|
| + 'irt_exception/irt_exception_test.cc',
|
| + ],
|
| + # TODO(uekawa): test_files get
|
| + # copied into nacl_test_data/pnacl/*, fix them.
|
| + 'nonsfi_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',
|
| + 'irt_exception/irt_exception_test.nmf',
|
| + ],
|
| + },
|
| + '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',
|
| + ],
|
| + 'copies': [
|
| + {
|
| + 'destination': '>(destination_dir)',
|
| + 'files': [
|
| + '>@(nonsfi_test_files)',
|
| + ],
|
| + },
|
| + ],
|
| + },
|
| + {
|
| 'target_name': 'ppapi_crash_in_callback',
|
| 'type': 'none',
|
| 'variables': {
|
|
|