Remove dependency of NaCl untarred toolchain from NaCl SDK Tests.

native_client_sdk/src/tools/tests/create_nmf_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium 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 json
 import os
 import posixpath
 import shutil
 import subprocess
 import sys
 import tempfile
 import unittest
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 TOOLS_DIR = os.path.dirname(SCRIPT_DIR)
 DATA_DIR = os.path.join(TOOLS_DIR, 'lib', 'tests', 'data')
 CHROME_SRC = os.path.dirname(os.path.dirname(os.path.dirname(TOOLS_DIR)))
 MOCK_DIR = os.path.join(CHROME_SRC, "third_party", "pymock")
 
 # For the mock library
 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
 
 
 def StripSo(name):
   """Strip trailing hexidecimal characters from the name of a shared object.
 
   It strips everything after the last '.' in the name, and checks that the new
   name ends with .so.
 
@@ skipping 38 matching lines @@
       paths = create_nmf.GetDefaultLibPath('Debug')
     self.assertTrue(any(os.path.join('ports', 'lib') in p for p in paths),
                     "naclports libpath missing: %s" % str(paths))
 
 
 class TestNmfUtils(unittest.TestCase):
   """Tests for the main NmfUtils class in create_nmf."""
 
   def setUp(self):
     self.tempdir = None
-    toolchain = os.path.join(CHROME_SRC, 'native_client', 'toolchain')
-    self.toolchain = os.path.join(toolchain, '%s_x86' % getos.GetPlatform(),
-                                  'nacl_x86_glibc')
+    self.toolchain = NACL_X86_GLIBC_TOOLCHAIN
     self.objdump = os.path.join(self.toolchain, 'bin', 'i686-nacl-objdump')
     if os.name == 'nt':
       self.objdump += '.exe'
     self._Mktemp()
 
   def _CreateTestNexe(self, name, arch):
     """Create an empty test .nexe file for use in create_nmf tests.
 
     This is used rather than checking in test binaries since the
     checked in binaries depend on .so files that only exist in the
@@ skipping 495 matching lines @@
             'optlevel': 0,
           }
         }
       }
     }
     self.assertManifestEquals(nmf, expected_manifest)
 
 
 if __name__ == '__main__':
   unittest.main()