Skip to content

Commit 65f355a

Browse files
committed
---
yaml --- r: 347773 b: refs/heads/master c: f0937a2 h: refs/heads/master i: 347771: 5b15942
1 parent 1ff9723 commit 65f355a

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: b1aee117fd02de2d6229cb2c5e5d44060fa9aa89
2+
refs/heads/master: f0937a2cbcdee72f5520993c0a593d1744fe190a
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/test/lit.cfg

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -944,6 +944,12 @@ elif run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'windows-cygnus', 'wi
944944
(config.variant_triple, clang_mcp_opt))
945945
config.target_ld = "ld -L%r" % (make_path(test_resource_dir, config.target_sdk_name))
946946
elif run_os == 'linux-androideabi' or run_os == 'linux-android':
947+
# The module triple for Android ARMv7 seems to be canonicalized in LLVM
948+
# to be armv7-none-linux-android, without the "eabi" bit. Let's remove the
949+
# same bit from the substitutions so the tests pass correctly.
950+
target_specific_module_triple = re.sub(r'androideabi', 'android',
951+
target_specific_module_triple)
952+
config.variant_triple = re.sub(r'androideabi', 'android', config.variant_triple)
947953
def get_architecture_value(**kwargs):
948954
result = kwargs[run_cpu]
949955
if result is None:

0 commit comments

Comments
 (0)