Remove i686-hosted Linux build and start switching to new directory layout

pnacl/driver/tests/driver_test_utils.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.
 
 import os
 from os.path import dirname
 import platform
 import sys
 import tempfile
 import unittest
 
 import driver_env
 import driver_log
 import driver_temps
 import driver_tools
 
 def CanRunHost():
   # Some of the test+tools require running the host binaries, but that
   # does not work on some bots (e.g., the ARM bots).
   if platform.machine().startswith('arm'):
     return False
   # We also cannot run some of the Windows binaries directly, since
   # they depend on cygwin DLLs and the cygwin DLLs are only in the
   # path for the installed drivers bin and not for the binaries.
   if sys.platform == 'win32':
     return False
   return True
 
-def _SetupLinuxHostDir(env, nacl_dir):
-  # Use the 32-bit path by default, but fall back to 64-bit if the 32-bit does
-  # not exist.
-  dir_template = os.path.join(nacl_dir, 'toolchain', 'linux_x86',
-                              'pnacl_newlib', 'host_%s')
-  dir_32 = dir_template % 'x86_32'
-  dir_64 = dir_template % 'x86_64'
-  driver_tools.AddHostBinarySearchPath(
-    dir_32 if os.path.exists(dir_32) else dir_64)
-
 def SetupNaClDir(env):
   test_dir = os.path.abspath(dirname(__file__))
   nacl_dir = dirname(dirname(dirname(test_dir)))
   env.set('BASE_NACL', nacl_dir)
 
 def SetupToolchainDir(env):
   test_dir = os.path.abspath(dirname(__file__))
   nacl_dir = dirname(dirname(dirname(test_dir)))
   os_name = driver_tools.GetOSName()
 
   toolchain_dir = os.path.join(nacl_dir, 'toolchain', '%s_x86' % os_name,
                                'pnacl_newlib')
   env.set('BASE_TOOLCHAIN', toolchain_dir)
 
 def SetupHostDir(env):
   # Some of the tools end up running one of the host binaries. Find the host
   # dir on the test system and inject it into the search path using the
   # implementation of -B
   test_dir = os.path.abspath(dirname(__file__))
   nacl_dir = dirname(dirname(dirname(test_dir)))
-  if sys.platform == 'darwin':
-    host_arch = 'x86_64'
-  elif sys.platform.startswith('linux'):
-    _SetupLinuxHostDir(env, nacl_dir)
-    return
-  elif sys.platform in ('cygwin', 'win32'):
-    host_arch = 'x86_32'
 
   os_shortname = driver_tools.GetOSName()
   host_dir = os.path.join(nacl_dir, 'toolchain',
                           '%s_x86' % os_shortname,
-                          'pnacl_newlib',
-                          'host_%s' % host_arch)
+                          'pnacl_newlib')
   driver_tools.AddHostBinarySearchPath(host_dir)
 
 # A collection of override methods that mock driver_env.Environment.
 
 # One thing is we prevent having to read a driver.conf file,
 # so instead we have a base group of variables set for testing.
 def TestEnvReset(self, more_overrides={}):
   # Call to "super" class method (assumed to be driver_env.Environment).
   # TODO(jvoung): We may want a different way of overriding things.
   driver_env.Environment.reset(self)
@@ skipping 58 matching lines @@
 
   def getTemp(self, close=True, **kwargs):
     """ Get a temporary named file object.
     """
     # Set delete=False, so that we can close the files and
     # re-open them.  Windows sometimes does not allow you to
     # re-open an already opened temp file.
     t = tempfile.NamedTemporaryFile(delete=False, **kwargs)
     self._tempfiles.append(t)
     return TempWrapper(t, close=close)