diff options
| author | dyen@chromium.org <dyen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-09 21:40:42 +0000 |
|---|---|---|
| committer | dyen@chromium.org <dyen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-09 21:40:42 +0000 |
| commit | 69438a50534ac47198e7749f27aad41ad8346900 (patch) | |
| tree | 0f2921c0fa043523dea3af31cd4c1512b68ebec9 /native_client_sdk | |
| parent | 8848607d6fa73eb95001e644ccd4cd7ba11c6ae8 (diff) | |
| download | chromium_src-69438a50534ac47198e7749f27aad41ad8346900.zip chromium_src-69438a50534ac47198e7749f27aad41ad8346900.tar.gz chromium_src-69438a50534ac47198e7749f27aad41ad8346900.tar.bz2 | |
Applied changes to chromium tree for new NaCl toolchain directories.
BUG= https://code.google.com/p/nativeclient/issues/detail?id=3816
TEST= trybots
Review URL: https://codereview.chromium.org/229283003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262825 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/tools/lib/tests/get_shared_deps_test.py | 3 | ||||
| -rwxr-xr-x | native_client_sdk/src/tools/tests/create_nmf_test.py | 3 |
2 files changed, 4 insertions, 2 deletions
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 d891c4f..a023c18 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 @@ -43,7 +43,8 @@ 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()) + 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' 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 aca8fe9..da09dd2 100755 --- a/native_client_sdk/src/tools/tests/create_nmf_test.py +++ b/native_client_sdk/src/tools/tests/create_nmf_test.py @@ -84,7 +84,8 @@ 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()) + 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' |