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

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

Issue 137853013: [NaCl SDK] Fix the AppEngine lua build after r243629. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 11 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/tools/nacl_config.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: native_client_sdk/src/tools/tests/nacl_config_test.py
diff --git a/native_client_sdk/src/tools/tests/nacl_config_test.py b/native_client_sdk/src/tools/tests/nacl_config_test.py
index c4e9919507797c91fedd1d62a0f6ce7c887228c5..31957c59aeb97ba4b6a283ce2a523810a78fc4ba 100755
--- a/native_client_sdk/src/tools/tests/nacl_config_test.py
+++ b/native_client_sdk/src/tools/tests/nacl_config_test.py
@@ -87,6 +87,8 @@ class TestNaclConfig(unittest.TestCase):
'/sdk_root/toolchain/mac_x86_glibc/bin/x86_64-nacl-%s' % nacl_tool,
'pnacl': '/sdk_root/toolchain/mac_pnacl/bin/pnacl-%s' % pnacl_tool,
+ ('pnacl', 'pnacl'):
+ '/sdk_root/toolchain/mac_pnacl/bin/pnacl-%s' % pnacl_tool,
}
for tc_arch, expected in cases.iteritems():
@@ -102,6 +104,12 @@ class TestNaclConfig(unittest.TestCase):
self.assertRaises(nacl_config.Error,
nacl_config.GetToolPath, toolchain, None, tool)
+ # Using toolchain=pnacl with any arch other than None, or 'pnacl' is an
+ # error.
+ for arch in ('x86_32', 'x86_64', 'arm', 'foobar'):
+ self.assertRaises(nacl_config.Error,
+ nacl_config.GetToolPath, toolchain, arch, tool)
+
# No arm glibc.
self.assertRaises(nacl_config.Error,
nacl_config.GetToolPath, 'glibc', 'arm', tool)
« no previous file with comments | « native_client_sdk/src/tools/nacl_config.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698