NonSFI NaCl: Plumb Exception IRT enough for breakpad.

chrome/test/data/nacl/nacl_test_data.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'includes': [
     '../../../../ppapi/ppapi_nacl_test_common.gypi',
   ],
   'targets': [
     {
@@ skipping 350 matching lines @@
       '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)/ppapi/native_client/native_client.gyp:ppapi_lib',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         'ppapi_test_lib',
       ],
     },
     {
+      '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 conditionalised, just like in
https://src.chromium.org/viewvc/chrome/trunk/src/ppapi/ppapi_nacl.gyp?r1=2613....
 See the current version of ppapi/ppapi_nacl.gyp.  Otherwise, you'll probably
find this fails on the trybots, since the test files won't get built in most
cases.

[Junichi Uekawa, 2014/04/25 22:13:53]

The things here are only necessary for nonsfi, because they are fixups for
missing functionality (generate_nmf:1 will only generate nmf for pexe and not
the nexe for nonsfi).

+        'variables': {

[Mark Seaborn, 2014/04/25 15:42:02]

This block should be indented by 2 more spaces relative to the line above

[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 consistency with the other tests
in this file?

[Junichi Uekawa, 2014/04/25 22:13:53]

I can call it something else, but we need this for nonsfi

+          '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 consistency with the other tests
here?

[Junichi Uekawa, 2014/04/25 22:13:53]

test_files is already set and used and confuses the pexe/nexe generation which
has other utilities copy nmf/nexe and js files, that's why I'm using something
different here.

+            # 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 think you shouldn't need one
here?

[Junichi Uekawa, 2014/04/25 22:13:53]

ppapi_nacl.gyp dumps files under out/Debug 
here we are putting files under out/Debug/nacl_test_data/{nonsfi,pnacl,...}

+          {
+            'destination': '>(destination_dir)',
+            'files': [
+              '>@(nonsfi_test_files)',
+            ],
+          },
+        ],
+      }],
+      ],
+    },
+    {
       'target_name': 'ppapi_crash_in_callback',
       'type': 'none',
       'variables': {
         'nexe_target': 'ppapi_crash_in_callback',
         'build_newlib': 1,
         'build_glibc': 1,
         'build_pnacl_newlib': 1,
         'nexe_destination_dir': 'nacl_test_data',
         'link_flags': [
           '-lppapi',
@@ skipping 720 matching lines @@
               'files': [
                 '>@(test_files)',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }