Non-SFI mode: Implement test launcher for nacl_helper_nonsfi_unittests

components/nacl_nonsfi.gyp

 # Copyright 2014 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/common_untrusted.gypi',
@@ skipping 160 matching lines @@
             '../content/content_nacl_nonsfi.gyp:content_common_nacl_nonsfi',
             '../sandbox/linux/sandbox_linux_nacl_nonsfi.gyp:sandbox_linux_nacl_nonsfi',
           ],
         },
       ],
     }],
 
     ['disable_nacl==0 and disable_nacl_untrusted==0 and enable_nacl_nonsfi_test==1', {
       'targets': [
         {
-          'target_name': 'nacl_helper_nonsfi_unittests',
+          'target_name': 'nacl_helper_nonsfi_unittests_main',
           'type': 'none',
           'variables': {
             'nacl_untrusted_build': 1,
             'nexe_target': 'nacl_helper_nonsfi_unittests',
             # Rename the output binary file to nacl_helper_nonsfi_unittests
             # and put it directly under out/{Debug,Release}/, so that this is
             # in the standard location, for running on the buildbots.
-            'out_newlib32_nonsfi': '<(PRODUCT_DIR)/nacl_helper_nonsfi_unittests',
-            'out_newlib_arm_nonsfi': '<(PRODUCT_DIR)/nacl_helper_nonsfi_unitttests',
+            'out_newlib32_nonsfi': '<(PRODUCT_DIR)/nacl_helper_nonsfi_unittests_main',
+            'out_newlib_arm_nonsfi': '<(PRODUCT_DIR)/nacl_helper_nonsfi_unitttests_main',
 
             'build_glibc': 0,
             'build_newlib': 0,
             'build_irt': 0,
             'build_pnacl_newlib': 0,
             'build_nonsfi_helper': 1,
 
             'sources': [
               'nacl/loader/nonsfi/nonsfi_sandbox_sigsys_unittest.cc',
               'nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc',
@@ skipping 58 matching lines @@
         },
       ],
     }],
 
     ['disable_nacl==0 and disable_nacl_untrusted==0 and enable_nacl_nonsfi_test==1 and test_isolation_mode!="noop"', {
       'targets': [
         {
           'target_name': 'nacl_helper_nonsfi_unittests_run',
           'type': 'none',
           'dependencies': [
-            'nacl_helper_nonsfi_unittests',
+            'nacl.gyp:nacl_helper_nonsfi_unittests',
           ],
           'includes': [
             '../build/isolate.gypi',
           ],
           'sources': [
             'nacl_helper_nonsfi_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }