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

Unified Diff: native_client_sdk/src/tools/tests/create_nmf_test.py

Issue 237883002: Remove dependency of NaCl untarred toolchain from NaCl SDK Tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
Index: native_client_sdk/src/tools/tests/create_nmf_test.py
diff --git a/native_client_sdk/src/tools/tests/create_nmf_test.py b/native_client_sdk/src/tools/tests/create_nmf_test.py
index da09dd20d076b32579df4e325038a1049e25bf38..9c97a25f1ccd82bd5fb6e1f3e55f28112536d81b 100755
--- a/native_client_sdk/src/tools/tests/create_nmf_test.py
+++ b/native_client_sdk/src/tools/tests/create_nmf_test.py
@@ -21,10 +21,13 @@ MOCK_DIR = os.path.join(CHROME_SRC, "third_party", "pymock")
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
@@ -83,9 +86,7 @@ class TestNmfUtils(unittest.TestCase):
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'

Powered by Google App Engine
This is Rietveld 408576698