Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(381)

Unified Diff: pnacl/driver/tests/driver_test_utils.py

Issue 580983002: Remove i686-hosted Linux build and start switching to new directory layout (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: review 2, put back test and build.sh patch from PS5 Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pnacl/driver/pnacl-llc.py ('k') | toolchain_build/pnacl_commands.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pnacl/driver/tests/driver_test_utils.py
diff --git a/pnacl/driver/tests/driver_test_utils.py b/pnacl/driver/tests/driver_test_utils.py
index bfec93231c34d0b9dd80009cf42dee9e96279e85..d082f52ffc7799379b890428e068bb1b1d6ce8b0 100644
--- a/pnacl/driver/tests/driver_test_utils.py
+++ b/pnacl/driver/tests/driver_test_utils.py
@@ -27,16 +27,6 @@ def CanRunHost():
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)))
@@ -57,19 +47,11 @@ def SetupHostDir(env):
# 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.
« no previous file with comments | « pnacl/driver/pnacl-llc.py ('k') | toolchain_build/pnacl_commands.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698