Enable some sandboxed translation tests

site_scons/site_tools/naclsdk.py

 #!/usr/bin/python
 # Copyright (c) 2012 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.
 
 """Nacl SDK tool SCons."""
 
 import __builtin__
 import re
 import os
@@ skipping 212 matching lines @@
   if env.Bit('pnacl_generate_pexe'):
     ld_arch_flag = ''
   else:
     ld_arch_flag = arch_flag
 
   if env.Bit('nacl_glibc'):
     subroot = root + '/glibc'
   else:
     subroot = root + '/newlib'
 
+  translator_root = os.path.join(os.path.dirname(root), 'pnacl_translator')
+
   binprefix = os.path.join(subroot, 'bin', 'pnacl-')
   binext = ''
   if env.Bit('host_windows'):
     binext = '.bat'
 
   if env.Bit('nacl_glibc'):
     # TODO(pdox): This bias is needed because runnable-ld is
     # expected to be in the same directory as the SDK.
     # This assumption should be removed.
     pnacl_lib = os.path.join(root, 'lib-%s' % arch)
     pnacl_extra_lib = os.path.join(subroot, 'lib')
   else:
     pnacl_lib = os.path.join(subroot, 'lib')
     pnacl_extra_lib = ''
 
   #TODO(robertm): remove NACL_SDK_INCLUDE ASAP
   if env.Bit('nacl_glibc'):
     pnacl_include = os.path.join(root, 'glibc', 'usr', 'include')
   else:
     pnacl_include = os.path.join(root, 'newlib', 'usr', 'include')
   pnacl_ar = binprefix + 'ar' + binext
   pnacl_as = binprefix + 'as' + binext
   pnacl_nm = binprefix + 'nm' + binext
   pnacl_ranlib = binprefix + 'ranlib' + binext
-  pnacl_translate = binprefix + 'translate' + binext
+  # Use the standalone sandboxed translator in sbtc mode
+  if env.Bit('use_sandboxed_translator'):
+    pnacl_translate = os.path.join(translator_root, 'bin',
+                                   'pnacl-translate' + binext)
+  else:
+    pnacl_translate = binprefix + 'translate' + binext
 
   frontend = env['PNACL_FRONTEND']
   if frontend == 'clang':
     pnacl_cc = binprefix + 'clang' + binext
     pnacl_cxx = binprefix + 'clang++' + binext
   elif frontend == 'dragonegg':
     pnacl_cc = binprefix + 'dgcc' + binext
     pnacl_cxx = binprefix + 'dg++' + binext
   else:
     print "Unknown frontend"
@@ skipping 60 matching lines @@
               STRIP=pnacl_strip,
               GENNMF=pnacl_nmf,
               TRANSLATE=pnacl_translate + arch_flag + pnacl_translate_flags,
               )
 
   if env.Bit('built_elsewhere'):
     def FakeInstall(dest, source, env):
       print 'Not installing', dest
     env.Replace(CC='true', CXX='true', LINK='true', AR='true',
                 RANLIB='true', AS='true', LD='true',
-                STRIP='true', INSTALL=FakeInstall,
-                #TODO(dschuff) remove this when we can translate on arm hw
-                TRANSLATE='true')
+                STRIP='true', INSTALL=FakeInstall)
 
 
 def _SetEnvForSdkManually(env):
   def GetEnvOrDummy(v):
     return os.getenv('NACL_SDK_' + v, 'MISSING_SDK_' + v)
 
   env.Replace(# Replace header and lib paths.
               NACL_SDK_INCLUDE=GetEnvOrDummy('INCLUDE'),
               NACL_SDK_LIB=GetEnvOrDummy('LIB'),
               # Replace the normal unix tools with the NaCl ones.
@@ skipping 52 matching lines @@
     native_env.Replace(CC='NO-NATIVE-CC-INVOCATION-ALLOWED',
                        CXX='NO-NATIVE-CXX-INVOCATION-ALLOWED')
   else:
     # These are unfortunately clobbered by running Tool.
     native_env.Replace(EXTRA_CFLAGS=env['EXTRA_CFLAGS'],
                        EXTRA_CXXFLAGS=env['EXTRA_CXXFLAGS'],
                        CCFLAGS=env['CCFLAGS'],
                        CFLAGS=env['CFLAGS'],
                        CXXFLAGS=env['CXXFLAGS'])
   if env.Bit('built_elsewhere'):
-    native_env.Replace(CC='true', CXX='true', LINK='true', LD='true')
+    native_env.Replace(CC='true', CXX='true', LINK='true', LD='true',
+                       AR='true', RANLIB='true')
   return native_env
 
 
 # This adds architecture specific defines for the target architecture.
 # These are normally omitted by PNaCl.
 # For example: __i686__, __arm__, __x86_64__
 def AddBiasForPNaCl(env, temporarily_allow=True):
   assert(env.Bit('bitcode'))
   # re: the temporarily_allow flag -- that is for:
   # BUG= http://code.google.com/p/nativeclient/issues/detail?id=1248
@@ skipping 204 matching lines @@
   # Dependency files it produces are to be found in ${LIBPATH}.
   # It is applied recursively to those dependencies in case
   # some of them are linker scripts too.
   ldscript_scanner = SCons.Scanner.Base(
       function=ScanLinkerScript,
       skeys=['.a', '.so', '.pso'],
       path_function=SCons.Scanner.FindPathDirs('LIBPATH'),
       recursive=True
       )
   env.Append(SCANNERS=ldscript_scanner)