summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHal Finkel <hfinkel@anl.gov>2012-11-20 03:40:57 +0000
committerHal Finkel <hfinkel@anl.gov>2012-11-20 03:40:57 +0000
commit16a8cf6eac26ec6f1ee6059617b398e686092f51 (patch)
tree9f9ecb0dd603014d66afd09c831ed7fe330e4e86
parentdbf293f3675d5b22560926e1bedd3b99c606e41b (diff)
downloadllvm-16a8cf6eac26ec6f1ee6059617b398e686092f51.tar.gz
llvm-16a8cf6eac26ec6f1ee6059617b398e686092f51.tar.bz2
llvm-16a8cf6eac26ec6f1ee6059617b398e686092f51.tar.xz
Merge in r168316 so that the proper JIT tests are run on PPC.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_32@168349 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/ExecutionEngine/MCJIT/lit.local.cfg5
-rw-r--r--test/ExecutionEngine/lit.local.cfg11
2 files changed, 14 insertions, 2 deletions
diff --git a/test/ExecutionEngine/MCJIT/lit.local.cfg b/test/ExecutionEngine/MCJIT/lit.local.cfg
index af3d13f746..7bcb9ae82c 100644
--- a/test/ExecutionEngine/MCJIT/lit.local.cfg
+++ b/test/ExecutionEngine/MCJIT/lit.local.cfg
@@ -8,12 +8,13 @@ def getRoot(config):
root = getRoot(config)
targets = set(root.targets_to_build.split())
-if ('X86' in targets) | ('ARM' in targets) | ('Mips' in targets):
+if ('X86' in targets) | ('ARM' in targets) | ('Mips' in targets) | \
+ ('PowerPC' in targets):
config.unsupported = False
else:
config.unsupported = True
-if root.host_arch not in ['x86', 'x86_64', 'ARM', 'Mips']:
+if root.host_arch not in ['x86', 'x86_64', 'ARM', 'Mips', 'PowerPC']:
config.unsupported = True
if root.host_os in ['Darwin']:
diff --git a/test/ExecutionEngine/lit.local.cfg b/test/ExecutionEngine/lit.local.cfg
index 19eebc0ac7..f0343263db 100644
--- a/test/ExecutionEngine/lit.local.cfg
+++ b/test/ExecutionEngine/lit.local.cfg
@@ -1 +1,12 @@
config.suffixes = ['.ll', '.c', '.cpp']
+
+def getRoot(config):
+ if not config.parent:
+ return config
+ return getRoot(config.parent)
+
+root = getRoot(config)
+
+if root.host_arch in ['PowerPC']:
+ config.unsupported = True
+