Fix nacl_integration to run 32bit tests with 32bit userland and 64bit kernel.

detect_host_arch.py already knows how to figure this out, so reuse it.
(It could probably be used in the darwin and maybe even in the windows
branch too.)

BUG=368384
TEST=nacl_integration on http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%282%29%2832%29/ goes green
TBR=mseaborn@chromium.org

Review URL: https://codereview.chromium.org/373253002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281831 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 8 deletions

diff --git a/build/detect_host_arch.py b/build/detect_host_arch.py
index 638dd68..19579eb 100755
--- a/build/detect_host_arch.py
+++ b/build/detect_host_arch.py
@@ -10,13 +10,8 @@ import re
 import sys
 
 
-def main():
-  print DoMain([])
-  return 0
-
-def DoMain(_):
-  """Hook to be called from gyp without starting a separate python
-  interpreter."""
+def HostArch():
+  """Returns the host architecture with a predictable string."""
   host_arch = platform.machine()
 
   # Convert machine type to format recognized by gyp.
@@ -36,5 +31,10 @@ def DoMain(_):
 
   return host_arch
 
+def DoMain(_):
+  """Hook to be called from gyp without starting a separate python
+  interpreter."""
+  return HostArch()
+
 if __name__ == '__main__':
-  sys.exit(main())
+  print DoMain([])