Non-SFI mode: Enable PnaclTransitional Non-SFI browser tests on x86-64 bots.

ppapi/ppapi_nacl.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.
 
 # This GYP file defines untrusted (NaCl) targets.  All targets in this
 # file should be conditionally depended upon via 'disable_nacl!=1' to avoid
 # requiring NaCl sources for building.
 
 {
   'includes': [
@@ skipping 217 matching lines @@
                 }],
                 ['target_arch=="x64" or (target_arch=="ia32" and OS=="win")', {
                   'inputs': [
                     '>(out_pnacl_newlib_x86_64_nexe)',
                   ],
                 }],
               ],
             },
           ],
         }],
-        ['disable_pnacl==0 and (target_arch=="ia32" or target_arch=="arm") and OS=="linux"', {
+        ['disable_pnacl==0 and (target_arch=="ia32" or target_arch=="x64" or target_arch=="arm") and OS=="linux"', {
           # In addition to above configuration, build x86-32 and arm nonsfi
           # .nexe files by translating from .pexe binary, for non-SFI mode PPAPI
           # testing.
           'variables': {
             'translate_pexe_with_build': 1,
             'nmf_nonsfi%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_nonsfi.nmf',
           },
           'conditions': [
-            ['target_arch=="ia32"', {
+            ['target_arch=="ia32" or target_arch=="x64"', {
               'variables': {
                 'enable_x86_32_nonsfi': 1,
               },
             }],
             ['target_arch=="arm"', {
               'variables': {
                 'enable_arm_nonsfi': 1,
               },
             }],
           ],
           # Shim is a dependency for the nexe because we pre-translate.
          'dependencies': [
             '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
           ],
           'actions': [
             {
               'action_name': 'Generate PNACL NEWLIB NONSFI NMF',
               'inputs': ['>(create_nonsfi_test_nmf)'],
               'outputs': ['>(nmf_nonsfi)'],
               'action': [
                 'python',
                 '>(create_nonsfi_test_nmf)',
                 '--output=>(nmf_nonsfi)',
               ],
               'target_conditions': [
-                ['enable_x86_32_nonsfi==1', {
+                ['enable_x86_32_nonsfi==1 and "<(target_arch)"=="ia32"', {
+                  'inputs': ['>(out_pnacl_newlib_x86_32_nonsfi_nexe)'],
                   'action': [
                     '--program=>(out_pnacl_newlib_x86_32_nonsfi_nexe)',
                     '--arch=x86-32',
-                  ],
+                  ]
+                }],
+                ['enable_x86_32_nonsfi==1 and "<(target_arch)"=="x64"', {
+                  'inputs': ['>(out_pnacl_newlib_x86_32_nonsfi_nexe)'],
+                  'action': [
+                    '--program=>(out_pnacl_newlib_x86_32_nonsfi_nexe)',
+                    # This should be used only for nacl_helper_nonsfi test.
+                    # In theory this should be x86-32. However, currently
+                    # fallback logic to x86-32-nonsfi is not implemented,
+                    # and, moreover, it would break the tests for current
+                    # nacl_helper in Non-SFI mode on x64 Chrome.
+                    # So, here we introduce the hack to use "x86-64" in order
+                    # to take the benefit to run nacl_helper_nonsfi tests on
+                    # x64 Chrome.
+                    # TODO(hidehiko): Remove this hack.
+                    '--arch=x86-64',
+                  ]
                 }],
                 ['enable_arm_nonsfi==1', {
+                  'inputs': ['>(out_pnacl_newlib_arm_nonsfi_nexe)'],
                   'action': [
                     '--program=>(out_pnacl_newlib_arm_nonsfi_nexe)',
                     '--arch=arm',
-                  ],
+                  ]
                 }],
               ],
             },
           ],
         }],
         ['disable_pnacl==0 and target_arch=="arm"', {
           'variables': {
             'build_pnacl_newlib': 1,
             'translate_pexe_with_build': 1,
             'nmf_pnacl%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl.nmf',
@@ skipping 37 matching lines @@
                 '>@(_inputs)',
                 '--output=>(nmf_pnacl)',
               ],
             },
           ],
         }],
       ],
     },
   ],
 }