Switch the nop pnacl x86-64 IRT shim to the real one generated from IDL.

tests/pnacl_client_translator/nacl.scons

 # -*- python -*-
 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import platform
 import re        # For StripArchFromLDCommand hack.
 import os.path   # For getting basenames.
 
 Import('env')
@@ skipping 149 matching lines @@
     map_files=map_files_toolchain + map_files_page,
     args=['--prefer_portable_in_manifest'])
 
 # Make sure the files are actually staged when this test runs.
 env.Depends(node, replicates_toolchain + replicates_page)
 
 bitcode_env.AddNodeToTestSuite(node,
                                ['chrome_browser_tests'],
                                'run_pnacl_example_browser_test',
                                is_broken=(
-                                   bitcode_env.PPAPIBrowserTesterIsBroken()))
+                                   bitcode_env.PPAPIBrowserTesterIsBroken() or
+                                   # Re-enable when coordinator uses shim
+                                   # and toolchain tarball has real shim.
+                                   bitcode_env.Bit('target_x86_64')))
 
 #### Test error handling.
 
 # We should add more cases, e.g., try a bad library to crash ld,
 # try a more malicious bitcode, try to exhaust resources, etc.
 # The current llc tests, don't actually crash LLC, they only
 # make llc exit w/ an abnormal status.
 
 (map_files_bad_page, replicates_bad_page) = LayoutPageAssetsOnServer(
     ['pnacl_bad_doesnotexist.nmf',
@@ skipping 25 matching lines @@
     map_files=map_files_toolchain + map_files_bad_page,
     args=['--allow_404', '--prefer_portable_in_manifest'])
 
 # Make sure the files are actually staged when this test runs.
 env.Depends(node, replicates_toolchain + replicates_bad_page)
 
 bitcode_env.AddNodeToTestSuite(node,
                                ['chrome_browser_tests'],
                                'run_pnacl_bad_browser_test',
                                is_broken=(
-                                   bitcode_env.PPAPIBrowserTesterIsBroken()))
+                                   bitcode_env.PPAPIBrowserTesterIsBroken() or
+                                   # Re-enable when coordinator uses shim
+                                   # and toolchain tarball has real shim.
+                                   bitcode_env.Bit('target_x86_64')))