Fix the standalone toolchain test for x86 flavors.
The x86 toolchain names are dumb in that they're the only ones that
aren't named by the full triple.
Change-Id: Idb6a9c10dd618f4f80d2762f031de3a6fac4f185
diff --git a/tests/build/standalone-toolchain/test.py b/tests/build/standalone-toolchain/test.py
index 7d49ce9..a697a16 100644
--- a/tests/build/standalone-toolchain/test.py
+++ b/tests/build/standalone-toolchain/test.py
@@ -37,8 +37,8 @@
cmd.append('--platform=' + platform)
if toolchain is not None:
- triple = build_support.arch_to_triple(arch)
- name = '{}-{}'.format(triple, toolchain)
+ toolchain_triple = build_support.arch_to_toolchain(arch)
+ name = '{}-{}'.format(toolchain_triple, toolchain)
cmd.append('--toolchain=' + name)
subprocess.check_call(cmd)
@@ -47,6 +47,9 @@
def test_standalone_toolchain(arch, toolchain, install_dir):
if toolchain == '4.9':
triple = build_support.arch_to_triple(arch)
+ # x86 toolchain names are dumb: http://b/25800583
+ if arch == 'x86':
+ triple = 'i686-linux-android'
compiler_name = triple + '-g++'
elif toolchain == 'clang3.6':
compiler_name = 'clang++'
