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

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 23 matching lines @@
           'crash/ppapi_crash_via_exit_call.html',
           'crash/ppapi_crash_in_callback.html',
           'crash/ppapi_crash_ppapi_off_main_thread.html',
           'crash/ppapi_crash_off_main_thread.html',
           'load_util.js',
           'manifest_file/test_file.txt',
           'progress_event_listener.js',
         ],
       },
       'conditions': [
-        ['target_arch=="ia32" and OS=="linux"', {
+        ['(target_arch=="ia32" or target_arch=="x64") and OS=="linux"', {
           # Enable nonsfi testing on ia32-linux environment.
           # This flag causes test_files to be copied into nonsfi directory,
           # too.
           'variables': {
             'enable_x86_32_nonsfi': 1,
           },
         }],
         ['target_arch=="arm" and OS=="linux"', {
           # Enable nonsfi testing on arm-linux environment.
           # This flag causes test_files to be copied into nonsfi directory,
@@ skipping 478 matching lines @@
         '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref_lib',
       ],
       'conditions': [
         # These are needed to build a non-SFI nexe binary.
         # Note that these trigger building nexe files for other
         # architectures, such as x86-32 (based on enable_XXX variables).
         # As described above, although the tests for pnacl are currently
         # disabled, but building the binary should work.
         # We cannot disable building, as enable_XXX variables are also used
         # to build newlib linked nexes.
-        ['target_arch=="ia32" and OS=="linux"', {
+        ['(target_arch=="ia32" or target_arch=="x64") and OS=="linux"', {
           # Enable nonsfi testing on ia32-linux environment.
           'variables': {
             'build_pnacl_newlib': 1,
             'translate_pexe_with_build': 1,
             'enable_x86_32_nonsfi': 1,
           },
         }],
         ['target_arch=="arm" and OS=="linux"', {
           # Enable nonsfi testing on arm-linux environment.
           'variables': {
@@ skipping 33 matching lines @@
         '<(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"', {
+        ['(target_arch=="ia32" or target_arch=="x64") and OS=="linux"', {
           # Enable nonsfi testing on ia32-linux environment.
           'variables': {
             'enable_x86_32_nonsfi': 1,
             'translate_pexe_with_build': 1,
           },
         }],
         ['target_arch=="arm" and OS=="linux"', {
           # Enable nonsfi testing on arm-linux environment.
           'variables': {
             'enable_arm_nonsfi': 1,
@@ skipping 436 matching lines @@
               'files': [
                 '>@(test_files)',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }