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

Unified Diff: native_client_sdk/src/tools/lib/tests/get_shared_deps_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: Fixed alphabetized import order 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
« no previous file with comments | « native_client_sdk/src/test_all.py ('k') | native_client_sdk/src/tools/tests/create_nmf_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: native_client_sdk/src/tools/lib/tests/get_shared_deps_test.py
diff --git a/native_client_sdk/src/tools/lib/tests/get_shared_deps_test.py b/native_client_sdk/src/tools/lib/tests/get_shared_deps_test.py
index a023c188b783cf6dd08445c8de564e22dda56a6b..49e405eb7c5f7378a139fd08c40a33936d92e4d2 100755
--- a/native_client_sdk/src/tools/lib/tests/get_shared_deps_test.py
+++ b/native_client_sdk/src/tools/lib/tests/get_shared_deps_test.py
@@ -14,14 +14,16 @@ SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
LIB_DIR = os.path.dirname(SCRIPT_DIR)
TOOLS_DIR = os.path.dirname(LIB_DIR)
DATA_DIR = os.path.join(SCRIPT_DIR, 'data')
-CHROME_SRC = os.path.dirname(os.path.dirname(os.path.dirname(TOOLS_DIR)))
sys.path.append(LIB_DIR)
sys.path.append(TOOLS_DIR)
-import getos
+import build_paths
import get_shared_deps
+TOOLCHAIN_OUT = os.path.join(build_paths.OUT_DIR, 'sdk_tests', 'toolchain')
+NACL_X86_GLIBC_TOOLCHAIN = os.path.join(TOOLCHAIN_OUT, 'nacl_x86_glibc')
+
def StripDependencies(deps):
'''Strip the dirnames and version suffixes from
@@ -42,9 +44,7 @@ def StripDependencies(deps):
class TestGetNeeded(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'
« no previous file with comments | « native_client_sdk/src/test_all.py ('k') | native_client_sdk/src/tools/tests/create_nmf_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698