| 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)
|
|
|