Non-SFI mode: Implement test launcher for nacl_helper_nonsfi_unittests

components/nacl_nonsfi.gyp

Index: components/nacl_nonsfi.gyp
diff --git a/components/nacl_nonsfi.gyp b/components/nacl_nonsfi.gyp
index aeead0d9b980ec33aabe20c6f9a36a9333423998..617316575541b843047a58e7472a532e4e703035 100644
--- a/components/nacl_nonsfi.gyp
+++ b/components/nacl_nonsfi.gyp
@@ -178,7 +178,7 @@
     ['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,
@@ -186,8 +186,8 @@
             # 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,
@@ -266,7 +266,7 @@
           'target_name': 'nacl_helper_nonsfi_unittests_run',
           'type': 'none',
           'dependencies': [
-            'nacl_helper_nonsfi_unittests',
+            'nacl.gyp:nacl_helper_nonsfi_unittests',
           ],
           'includes': [
             '../build/isolate.gypi',