Revert 263791 "Remove dependency of NaCl untarred toolchain from..."

trunk/src/native_client_sdk/src/tools/tests/create_nmf_test.py

Index: trunk/src/native_client_sdk/src/tools/tests/create_nmf_test.py
===================================================================
--- trunk/src/native_client_sdk/src/tools/tests/create_nmf_test.py	(revision 263903)
+++ trunk/src/native_client_sdk/src/tools/tests/create_nmf_test.py	(working copy)
@@ -21,14 +21,11 @@
 sys.path.append(MOCK_DIR)
 sys.path.append(TOOLS_DIR)
 
-import build_paths
 import create_nmf
+import getos
 import mock
 
-TOOLCHAIN_OUT = os.path.join(build_paths.OUT_DIR, 'sdk_tests', 'toolchain')
-NACL_X86_GLIBC_TOOLCHAIN = os.path.join(TOOLCHAIN_OUT, 'nacl_x86_glibc')
 
-
 PosixRelPath = create_nmf.PosixRelPath
 
 
@@ -86,7 +83,9 @@
 
   def setUp(self):
     self.tempdir = None
-    self.toolchain = NACL_X86_GLIBC_TOOLCHAIN
+    toolchain = os.path.join(CHROME_SRC, 'native_client', 'toolchain')
+    self.toolchain = os.path.join(toolchain, '%s_x86' % getos.GetPlatform(),
+                                  'nacl_x86_glibc')
     self.objdump = os.path.join(self.toolchain, 'bin', 'i686-nacl-objdump')
     if os.name == 'nt':
       self.objdump += '.exe'