Add a dependency on the AOT shim to all nacl_test_data PNaCl nexe targets.

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 33 matching lines @@
             'enable_x86_32_nonsfi': 1,
           },
         }],
       ],
     },
     {
       'target_name': 'simple_test',
       'type': 'none',
       'variables': {
         'nexe_target': 'simple',
         'build_newlib': 1,

[Mark Seaborn, 2014/07/22 03:28:08]

To clarify: I think it's possible to disable translating from pexe to nexe by
setting "enable_x86_32=0" etc., but presumably that would have the side effect
of disabling using the GCC toolchain too, which would break other tests?

(I think that's what you're referring to in the commit message with "Leaving out
some of the PNaCl targets which actually do manage to turn off pexe -> nexe
translation".)

[jvoung (off chromium), 2014/07/22 15:40:54]

Yes, that helps disable pexe to nexe, but it also disables GCC. So it's only
done for a few PNaCl-only tests.

         'build_glibc': 1,
         'build_pnacl_newlib': 1,
         'nexe_destination_dir': 'nacl_test_data',
         'sources': [
           'simple.cc',
         ],
         'test_files': [
           'nacl_load_test.html',
         ],
       },
+      # We only need the pexe for this test. However, build_pnacl_newlib: 1
+      # will also translate that pexe into a nexe, so add the shim
+      # just in case of a race condition.
+      'dependencies': [
+        '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
+      ],
     },
     {
       'target_name': 'exit_status_test',
       'type': 'none',
       'variables': {
         'nexe_target': 'pm_exit_status_test',
         'build_newlib': 1,
         'build_glibc': 1,
         'build_pnacl_newlib': 1,
         'nexe_destination_dir': 'nacl_test_data',
         'sources': [
           'exit_status/pm_exit_status_test.cc',
         ],
         'test_files': [
           'exit_status/pm_exit_status_test.html',
         ],
       },
+      'dependencies': [
+        '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
+      ],
     },
     {
       'target_name': 'extension_validation_cache',
       'type': 'none',
       'variables': {
         'nexe_target': 'extension_validation_cache',
         # The test currently only has the test expectations for the
         # newlib case (# validation queries/settings), and has also
         # hardcoded the newlib variant's directory path for the unpacked ext.
         'build_newlib': 1,
@@ skipping 31 matching lines @@
         'build_glibc': 1,
         'build_pnacl_newlib': 1,
         'nexe_destination_dir': 'nacl_test_data',
         'sources': [
           'sysconf_nprocessors_onln/sysconf_nprocessors_onln_test.cc',
         ],
         'test_files': [
           'sysconf_nprocessors_onln/sysconf_nprocessors_onln_test.html',
         ],
       },
+      'dependencies': [

[jvoung (off chromium), 2014/07/22 00:50:28]

some of these should also depend on prep_toolchain?

[Mark Seaborn, 2014/07/22 03:28:08]

Is there any reason why this this dependency can't be done automatically for all
NaCl targets by untrusted.gypi?

[jvoung (off chromium), 2014/07/22 15:40:54]

That would be nice. I haven't tried it though. Currently untrusted.gypi does add
dependencies for any target... just adds actions.

+        '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
+      ],
     },
     {
       'target_name': 'ppapi_test_lib',
       'type': 'none',
       'variables': {
         'nlib_target': 'libppapi_test_lib.a',
         'nso_target': 'libppapi_test_lib.so',
         'build_newlib': 1,
         'build_glibc': 1,
         'build_pnacl_newlib': 1,
@@ skipping 52 matching lines @@
         ],
         'test_files': [
           'progress_events/ppapi_progress_events.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)/ppapi/native_client/native_client.gyp:ppapi_lib',
+        '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         'ppapi_test_lib',
       ],
     },
     {
       'target_name': 'ppapi_bad_ppp_initialize',
       'type': 'none',
       'variables': {
         'nexe_target': 'ppapi_bad_ppp_initialize',
         'build_newlib': 1,
@@ skipping 158 matching lines @@
         ],
         'sources': [
           'crash/ppapi_crash_via_check_failure.cc',
         ],
       },
       '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/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         'ppapi_test_lib',
       ],
     },
     {
       'target_name': 'ppapi_crash_via_exit_call',
       'type': 'none',
       'variables': {
         'nexe_target': 'ppapi_crash_via_exit_call',
         'build_newlib': 1,
         'build_glibc': 1,
         'build_pnacl_newlib': 1,
         'nexe_destination_dir': 'nacl_test_data',
         'link_flags': [
           '-lppapi',
           '-lppapi_test_lib',
           '-lplatform',
           '-lgio',
         ],
         'sources': [
           'crash/ppapi_crash_via_exit_call.cc',
         ],
       },
       '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/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         'ppapi_test_lib',
       ],
     },
     {
       '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',
           '-lppapi_test_lib',
           '-lplatform',
           '-lgio',
         ],
         'sources': [
           'crash/ppapi_crash_in_callback.cc',
         ],
       },
       '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/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         'ppapi_test_lib',
       ],
     },
     {
       'target_name': 'ppapi_crash_off_main_thread',
       'type': 'none',
       'variables': {
         'nexe_target': 'ppapi_crash_off_main_thread',
         'build_newlib': 1,
         'build_glibc': 1,
         'build_pnacl_newlib': 1,
         'nexe_destination_dir': 'nacl_test_data',
         'link_flags': [
           '-lppapi',
           '-lppapi_test_lib',
           '-lplatform',
           '-lgio',
         ],
         'sources': [
           'crash/ppapi_crash_off_main_thread.cc',
         ],
       },
       '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/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         'ppapi_test_lib',
       ],
     },
     {
       'target_name': 'ppapi_crash_ppapi_off_main_thread',
       'type': 'none',
       'variables': {
         'nexe_target': 'ppapi_crash_ppapi_off_main_thread',
         'build_newlib': 1,
         'build_glibc': 1,
         'build_pnacl_newlib': 1,
         'nexe_destination_dir': 'nacl_test_data',
         'link_flags': [
           '-lppapi',
           '-lppapi_test_lib',
           '-lplatform',
           '-lgio',
         ],
         'sources': [
           'crash/ppapi_crash_ppapi_off_main_thread.cc',
         ],
       },
       '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/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         'ppapi_test_lib',
       ],
     },
     {
       'target_name': 'pm_redir_test',
       'type': 'none',
       'variables': {
         'nexe_target': 'pm_redir_test',
         'build_newlib': 1,
@@ skipping 10 matching lines @@
         ],
         'test_files': [
           'postmessage_redir/pm_redir_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)/ppapi/native_client/native_client.gyp:ppapi_lib',
+        '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
       ],
     },
     {
       'target_name': 'pm_manifest_file',
       'type': 'none',
       'variables': {
         'nexe_target': 'pm_manifest_file',
         'build_newlib': 1,
         'build_glibc': 1,
@@ skipping 171 matching lines @@
           # converted.
           '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/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         'ppapi_test_lib',
       ],
       'conditions': [
         ['target_arch=="ia32" and OS=="linux"', {
           # Enable nonsfi testing only on ia32-linux environment.
           'variables': {
             'enable_x86_32_nonsfi': 1,
           },
         }],
@@ skipping 23 matching lines @@
           'nameservice/pm_nameservice_test.cc',
         ],
         'test_files': [
           'nameservice/pm_nameservice_test.html',
         ],
       },
       'dependencies': [
         '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
+        '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
         '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:srpc_lib',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
         '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc_lib',
         '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
         '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref_lib',
         'nacl_ppapi_util',
       ],
     },
     {
@@ skipping 228 matching lines @@
         ],
         'test_files': [
           'ppapi/ppb_core/ppapi_ppb_core.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)/ppapi/native_client/native_client.gyp:ppapi_lib',
+        '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         'ppapi_test_lib',
       ],
     },
     {
       'target_name': 'ppapi_ppb_instance',
       'type': 'none',
       'variables': {
         'nexe_target': 'ppapi_ppb_instance',
         'build_newlib': 1,
@@ skipping 11 matching lines @@
         ],
         'test_files': [
           'ppapi/ppb_instance/ppapi_ppb_instance.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)/ppapi/native_client/native_client.gyp:ppapi_lib',
+        '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         'ppapi_test_lib',
       ],
     },
     {
       'target_name': 'ppapi_ppp_instance',
       'type': 'none',
       'variables': {
         'nexe_target': 'ppapi_ppp_instance',
         'build_newlib': 1,
@@ skipping 12 matching lines @@
         'test_files': [
           'ppapi/ppp_instance/ppapi_ppp_instance.html',
           'ppapi/ppp_instance/ppapi_ppp_instance.js',
         ],
       },
       '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/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         'ppapi_test_lib',
       ],
     },
   ],
   'conditions': [
     ['target_arch!="arm"', {
       # Source file does not have asm for ARM.
       'targets': [
         {
@@ skipping 144 matching lines @@
               'files': [
                 '>@(test_files)',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }